Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/docker/dev-tools/develop/amazo…
Browse files Browse the repository at this point in the history
…n/aws-cli-2.22.5
  • Loading branch information
gabezurita authored Nov 26, 2024
2 parents 3d5e3a4 + aad6a8c commit 9ad1ed2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
13 changes: 3 additions & 10 deletions .github/actions/setup-vro/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,9 @@ runs:
# cache the Gradle User Home"
# cache: 'gradle'

# https://github.com/gradle/actions/blob/v3.5.0/setup-gradle/action.yml
- name: "Setup Gradle"
uses: gradle/actions/setup-gradle@v3
with:
# Only write to the cache for builds on the 'main' and 'develop' branches. (Default is 'main' only.)
# Builds on other branches will only read existing entries from the cache.
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/qa' && github.ref != 'refs/heads/develop' }}
# To avoid a growing cache over time, attempt to delete any files in the Gradle User Home
# that were not used by Gradle during the workflow, prior to saving the cache.
gradle-home-cache-cleanup: true
- name: "Clear Gradle Cache"
shell: bash
run: rm -rf ~/.gradle || true

- uses: ./.github/actions/install-java-tools

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/secrel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
outputs:
run-secrel: ${{ steps.check-run-conds.outputs.run_secrel }}
publish-images: ${{ steps.check-run-conds.outputs.publish_images }}
runs-on: ubuntu-20.04 # NOTE: As VRO is being shut down, this version is pinned to get around a .gradle issue with removeUnusedEntriesOlderThan.
runs-on: ubuntu-latest
steps:
- name: "Decide downstream actions"
id: check-run-conds
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
outputs:
vro-images: ${{ steps.publish-images.outputs.images_list }}
slack-response-ts: ${{ fromJson(steps.notify-slack.outputs.slack-result).response.message.ts }}
runs-on: ubuntu-20.04 # NOTE: As VRO is being shut down, this version is pinned to get around a .gradle issue with removeUnusedEntriesOlderThan.
runs-on: ubuntu-latest
steps:
- name: "Determine image tag"
id: image-props
Expand Down

0 comments on commit 9ad1ed2

Please sign in to comment.