Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/bugfix/kube-deployment-fixes' in…
Browse files Browse the repository at this point in the history
…to bugfix/kube-deployment-fixes
  • Loading branch information
acies312 committed Mar 6, 2024
2 parents 4de71af + f7a7bdb commit 0b49709
Show file tree
Hide file tree
Showing 34 changed files with 210 additions and 153 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/backend-api-spec-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ jobs:
update_backend_api_spec:
runs-on: ubuntu-latest
steps:
- uses: peterjgrainger/action-create-branch@v2.4.0
- uses: peterjgrainger/action-create-branch@v3.0.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
branch: 'infra/update-backend-api-spec'

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: 'infra/update-backend-api-spec'
fetch-depth: 0 # we need a full history to make rebase with master

- name: Set up Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand All @@ -45,7 +45,7 @@ jobs:
echo SAVE_CLI_GRADLE_OPTS=-PsaveCliPath=${{ github.workspace }}/save-cli >> $GITHUB_ENV
- name: Generate open api doc
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-base-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ jobs:
- base_image_name: ubuntu
base_image_tag: '20.04'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- if: github.event_name == 'workflow_dispatch'
name: Prepare to build from branch
run: |
git fetch
git checkout origin/${{ inputs.branch }}
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: saveourtool
password: ${{ secrets.GITHUB_TOKEN }}
- name: Prepare formatted tags
run: |
echo FORMATTED_TAG=${{ matrix.base_image_tag }} | sed -e "s/-focal$//" | sed -e "s/20.04$/latest/" >> $GITHUB_ENV
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: save-deploy/base-images
push: true
Expand All @@ -72,18 +72,18 @@ jobs:
name: Build custom Paketo builder for CPG-demo
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- if: github.event_name == 'workflow_dispatch'
name: Prepare to build from branch
run: |
git fetch
git checkout origin/${{ inputs.branch }}
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: saveourtool
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: save-demo-cpg/builder
push: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ jobs:
steps:
- id: checkout
if: ${{ github.event_name == 'push' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- id: git-changed-files
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v42
with:
files_yaml: |
root_gradle:
Expand Down Expand Up @@ -230,9 +230,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download gradle reports
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4

- name: Code coverage report
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: false
12 changes: 6 additions & 6 deletions .github/workflows/build_and_test_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
if: inputs.do-build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# required for correct codecov upload
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand All @@ -38,12 +38,12 @@ jobs:
kv=$(cat gradle/libs.versions.toml | grep '^kotlin =' | awk -F'[=]' '{print $2}' | tr -d '" ')
echo KOTLIN_VERSION=$kv >> $GITHUB_ENV
- name: Cache konan
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.konan
key: ${{ runner.os }}-gradle-konan-${{ env.KOTLIN_VERSION }}
- name: Build ${{ inputs.module }}
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
gradle-home-cache-cleanup: true
Expand All @@ -60,14 +60,14 @@ jobs:
--build-cache
- name: Upload gradle reports ${{ inputs.module }}
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gradle-reports-${{ inputs.module }}
path: '${{ inputs.module }}/build/reports/'
retention-days: 1
- name: Upload frontend distribution
if: inputs.module == 'save-frontend'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: save-frontend
path: 'save-frontend/build/libs/save-frontend-*-distribution.jar'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_save-agent_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout save-cloud
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ inputs.branch }}
Expand All @@ -43,7 +43,7 @@ jobs:
kv=$(cat gradle/libs.versions.toml | grep -m1 '^kotlin =' | awk -F'[=]' '{print $2}' | tr -d '" ')
echo KOTLIN_VERSION=$kv >> $GITHUB_ENV
- name: Cache konan
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.konan
key: ${{ runner.os }}-gradle-konan-${{ env.KOTLIN_VERSION }}
Expand All @@ -57,7 +57,7 @@ jobs:
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev

- name: Build save-agent and save-demo-agent
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand All @@ -73,20 +73,20 @@ jobs:
- name: Upload save-agent
if: inputs.build-save-agent
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: save-agent
path: 'save-agent/build/libs/save-agent-*-distribution.jar'
- name: Upload save-demo-agent
if: inputs.build-save-demo-agent
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: save-demo-agent
path: 'save-demo-agent/build/libs/save-demo-agent-*-distribution.jar'

- name: Upload gradle reports
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gradle-reports
path: '**/build/reports/'
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build_save-cli_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
version: ${{ steps.save-cli-version.outputs.version }}
steps:
- name: checkout save-cloud
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
sparse-checkout: |
gradle/libs.versions.toml
Expand All @@ -34,12 +34,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout save-cli
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: saveourtool/save-cli
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand All @@ -49,12 +49,12 @@ jobs:
kv=$(cat gradle/libs.versions.toml | grep '^kotlin =' | awk -F'[=]' '{print $2}' | tr -d '" ')
echo SAVE_CLI_KOTLIN_VERSION=$kv >> $GITHUB_ENV
- name: Cache konan
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.konan
key: ${{ runner.os }}-gradle-konan-${{ env.SAVE_CLI_KOTLIN_VERSION }}
- name: Build save-cli
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand All @@ -67,14 +67,14 @@ jobs:
run: |
find save-cli/build/bin/linuxX64/releaseExecutable -name "save-*.kexe" -exec sh -c 'printf "$1" | sed -r "s/.*save-(.*)-linuxX64.kexe/\1/" | echo "SAVE_CLI_VERSION=$(cat)" >> $GITHUB_ENV' _ {} \;
- name: Upload save-cli
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: save-cli
path: 'save-cli/build/bin/linuxX64/releaseExecutable/save-*.kexe'
retention-days: 1
- name: Upload gradle reports
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gradle-reports
path: '**/build/reports/'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ct.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# https://github.com/helm/chart-testing#local-repo
- uses: pozetroninc/github-action-get-latest-release@master
id: ct-version
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/deploy_images_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: checkout save-cloud
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ inputs.branch }}
Expand All @@ -53,19 +53,19 @@ jobs:
kv=$(cat gradle/libs.versions.toml | grep -m1 '^kotlin =' | awk -F'[=]' '{print $2}' | tr -d '" ')
echo KOTLIN_VERSION=$kv >> $GITHUB_ENV
- name: Cache konan
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.konan
key: ${{ runner.os }}-gradle-konan-${{ env.KOTLIN_VERSION }}
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin

- name: Download save-cli
if: ${{ endsWith(inputs.save-cli-version, '-SNAPSHOT') }}
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: save-cli
path: ${{ github.workspace }}/save-cli
Expand All @@ -76,7 +76,7 @@ jobs:
- name: Download save-agent
if: inputs.module == 'save-backend'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: save-agent
path: ${{ github.workspace }}/save-agent
Expand All @@ -87,7 +87,7 @@ jobs:
- name: Download save-demo-agent
if: inputs.module == 'save-demo'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: save-demo-agent
path: ${{ github.workspace }}/save-demo-agent
Expand All @@ -97,7 +97,7 @@ jobs:
echo SAVE_DEMO_AGENT_GRADLE_OPTS=-PsaveDemoAgentPath=${{ github.workspace }}/save-demo-agent >> $GITHUB_ENV
- name: Build image for ${{ inputs.module }}
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand All @@ -113,7 +113,7 @@ jobs:
${{ env.ADDITIONAL_GRADLE_OPTS }}
- name: Upload gradle reports
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gradle-reports
path: '**/build/reports/'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
security-events: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand All @@ -29,12 +29,12 @@ jobs:
-PgprUser=${{ github.actor }}
-PgprKey=${{ secrets.GITHUB_TOKEN }}
- name: Upload SARIF report to Github
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
if: ${{ always() }}
with:
sarif_file: build/detekt-sarif-reports/detekt-merged.sarif
- name: Upload SARIF artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() }}
with:
name: sarif-reports
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/diktat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
security-events: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand All @@ -32,12 +32,12 @@ jobs:
-PgprUser=${{ github.actor }}
-PgprKey=${{ secrets.GITHUB_TOKEN }}
- name: Upload SARIF report to Github
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
if: ${{ always() }}
with:
sarif_file: build/reports/diktat/diktat-merged.sarif
- name: Upload SARIF artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() }}
with:
name: sarif-reports
Expand Down
Loading

0 comments on commit 0b49709

Please sign in to comment.