Skip to content

Commit

Permalink
[RS-XX]: Disable GitGuardian to build IPF Container as API Token is n…
Browse files Browse the repository at this point in the history
…ot valid anymore #IPF
  • Loading branch information
w-jka committed Jan 24, 2025
1 parent 394829d commit 6726867
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 32 deletions.
34 changes: 18 additions & 16 deletions .github/workflows/build-ipf-s1-l1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,26 @@ env:
COMMIT_ID: ${{ github.sha }}

jobs:
gg-scan:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: GitGuardian scan
uses: GitGuardian/ggshield-action@master
env:
GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}
# GitGuardian Token is not valid anymore
# gg-scan:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout repository
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - name: GitGuardian scan
# uses: GitGuardian/ggshield-action@master
# env:
# GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
# GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
# GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
# GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
# GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}

build-ipf-s1-l1:
needs: [gg-scan]
# GitGuardian Token is not valid anymore
#needs: [gg-scan]
runs-on: ubuntu-latest
# Just build when being a tag or explicitely asked for using #IPF
if: startsWith(github.ref, 'refs/tags') || contains(github.event.head_commit.message, '#IPF')
Expand Down
34 changes: 18 additions & 16 deletions .github/workflows/build-ipf-s1-l2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,26 @@ env:
COMMIT_ID: ${{ github.sha }}

jobs:
gg-scan:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: GitGuardian scan
uses: GitGuardian/ggshield-action@master
env:
GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}
# GitGuardian Token is not valid anymore
# gg-scan:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout repository
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - name: GitGuardian scan
# uses: GitGuardian/ggshield-action@master
# env:
# GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
# GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
# GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
# GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
# GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}

build-ipf-s1-l2:
needs: [gg-scan]
# GitGuardian Token is not valid anymore
# needs: [gg-scan]
runs-on: ubuntu-latest
# Just build when being a tag or explicitely asked for using #IPF
if: startsWith(github.ref, 'refs/tags') || contains(github.event.head_commit.message, '#IPF')
Expand Down
3 changes: 3 additions & 0 deletions rs-container/docker_s1_ipf_l1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ COPY --from=base /log/log4j2.yml /log/log4j2.yml

USER root:root

# Update yum Repo do use https instead of http
RUN sed -i 's%http://%https://%g' /etc/yum.repos.d/CentOS-Base.repo

# Install java 11
RUN yum install -y java-11-openjdk
#RUN update-alternatives --set java /usr/lib/jvm/java-11-openjdk-11.0.4.11-0.el7_6.x86_64/bin/java
Expand Down
3 changes: 3 additions & 0 deletions rs-container/docker_s1_ipf_l2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ COPY simplified_sea_cls.geojson /app/simplified_sea_cls.geojson

USER root:root

# Update yum Repo do use https instead of http
RUN sed -i 's%http://%https://%g' /etc/yum.repos.d/CentOS-Base.repo

# Install java 11
RUN yum install -y java-11-openjdk
#RUN update-alternatives --set java /usr/lib/jvm/java-11-openjdk-11.0.4.11-0.el7_6.x86_64/bin/java
Expand Down

0 comments on commit 6726867

Please sign in to comment.