Skip to content

Commit

Permalink
[patch] updating github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
robertfmurdock committed Apr 3, 2024
1 parent cca4cc6 commit ca57fbe
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 22 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/gradle-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
name: "Create Update Branch"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: '25'
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
cache-read-only: true
- name: Update Deps
Expand All @@ -23,16 +23,14 @@ jobs:
run: ./gradlew kotlinUpgradeYarnLock --no-configuration-cache --no-build-cache
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
branch: "cpr-gradle-update/${{github.job}}/${{github.run_id}}"
commit-message: "[patch] ${{github.workflow}}"
token: ${{ secrets.TESTMINTS_PAT }}
delete-branch: true
- name: Enable Pull Request Automerge
if: steps.cpr.outputs.pull-request-operation == 'created'
uses: peter-evans/enable-pull-request-automerge@v2
with:
token: ${{ secrets.TESTMINTS_PAT }}
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
merge-method: rebase
run: gh pr merge --rebase --auto "${{ steps.cpr.outputs.pull-request-number }}"
env:
GH_TOKEN: ${{ secrets.TESTMINTS_PAT }}
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ jobs:
with:
firefox-version: latest
- run: echo "FIREFOX_BINARY=$(which firefox)" >> $GITHUB_ENV
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: testspace-com/setup-testspace@v1
with:
domain: robertfmurdock
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
cache-read-only: ${{ github.ref != 'refs/heads/master' }}
- name: Generate Version 🔢
Expand All @@ -61,7 +61,7 @@ jobs:
- name: Collect Test Results
if: ${{ always() }}
run: ./gradlew collectResults
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: test-output
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/update-gradle-wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,24 @@ jobs:
update-gradle-wrapper:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: '25'
- uses: burrunan/gradle-cache-action@v1
name: Update Deps
- name: Setup Current Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: current
arguments: wrapper --distribution-type all
- run: gradle wrapper --distribution-type all
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
branch: "cpr/${{github.job}}/${{github.run_id}}"
commit-message: "[patch] ${{github.workflow}}"
token: ${{ secrets.TESTMINTS_PAT }}
delete-branch: true
- name: Enable Pull Request Automerge
if: steps.cpr.outputs.pull-request-operation == 'created'
uses: peter-evans/enable-pull-request-automerge@v2
with:
token: ${{ secrets.TESTMINTS_PAT }}
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
merge-method: rebase
run: gh pr merge --rebase --auto "${{ steps.cpr.outputs.pull-request-number }}"
env:
GH_TOKEN: ${{ secrets.TESTMINTS_PAT }}
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ca57fbe

Please sign in to comment.