Skip to content

Commit

Permalink
update to latest github actions; action cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
davidangb committed Feb 10, 2025
1 parent 7f99298 commit a2e6999
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/master_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
echo semver-part=$SEMVER_PART >> $GITHUB_OUTPUT
echo checkout-branch=$CHECKOUT_BRANCH >> $GITHUB_OUTPUT
- name: Checkout current code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ steps.controls.outputs.checkout-branch }}
token: ${{ secrets.BROADBOT_TOKEN }}
Expand All @@ -66,22 +66,22 @@ jobs:
VERSION_SUFFIX: SNAPSHOT
- name: Auth to GCR
if: steps.skiptest.outputs.is-bump == 'no'
uses: google-github-actions/auth@v1
uses: google-github-actions/auth@v2
with:
version: '411.0.0'
credentials_json: ${{ secrets.GCR_PUBLISH_KEY_B64 }}
- name: Setup gcloud
if: steps.skiptest.outputs.is-bump == 'no'
uses: google-github-actions/setup-gcloud@v1
uses: google-github-actions/setup-gcloud@v2
- name: Explicitly auth Docker for GCR
if: steps.skiptest.outputs.is-bump == 'no'
run: gcloud auth configure-docker --quiet
- name: Set up JDK 17
if: steps.skiptest.outputs.is-bump == 'no'
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
cache: 'gradle'
- name: Grant execute permission for gradlew
if: steps.skiptest.outputs.is-bump == 'no'
run: chmod +x gradlew
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Skip version bump merges
id: skiptest
uses: ./.github/actions/bump-skip
Expand Down Expand Up @@ -91,19 +91,11 @@ jobs:
run: psql -h 127.0.0.1 -U postgres -f ./local-dev/local-postgres-init.sql
- name: Set up JDK 17
if: steps.skiptest.outputs.is-bump == 'no'
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
- name: Cache Gradle packages
if: steps.skiptest.outputs.is-bump == 'no'
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: v1-${{ runner.os }}-gradle-${{ hashfiles('**/gradle-wrapper.properties') }}-${{ hashFiles('**/*.gradle') }}
restore-keys: v1-${{ runner.os }}-gradle-${{ hashfiles('**/gradle-wrapper.properties') }}
cache: 'gradle'
- name: Grant execute permission for gradlew
if: steps.skiptest.outputs.is-bump == 'no'
run: chmod +x gradlew
Expand Down

0 comments on commit a2e6999

Please sign in to comment.