From 2b4d449f465e06eb71ac87e79f169444876b504d Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sat, 23 Apr 2022 08:17:11 +0200 Subject: [PATCH] project(actions): Update --- .github/workflows/gradle.yml | 2 +- .github/workflows/merge.yml | 4 +-- .github/workflows/pr.yml | 56 +++++++++++++---------------------- .github/workflows/push.yml | 48 ++++++++++-------------------- .github/workflows/scraper.yml | 15 ++++------ 5 files changed, 44 insertions(+), 81 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8d16f9b50c..6ddc101465 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.4.2 - name: Make gradlew executable run: chmod +x ./gradlew - name: Update Gradle Wrapper diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 49c4c5c22d..5ae02f9263 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -13,7 +13,7 @@ jobs: steps: - name: automerge if: github.event_name == 'pull_request' && github.actor == 'Owain94' - uses: pascalgn/automerge-action@v0.12.0 + uses: pascalgn/automerge-action@v0.15.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_FORKS: false @@ -32,7 +32,7 @@ jobs: - name: Delete PR head branch if: github.event_name == 'pull_request' && github.actor == 'Owain94' - uses: dawidd6/action-delete-branch@v3.0.2 + uses: dawidd6/action-delete-branch@v3.1.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} branches: ${{ steps.extract_branch.outputs.branch }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c890671c55..76dd2db91c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ jobs: steps: - name: PR title lint if: github.event_name == 'pull_request' - uses: morrisoncole/pr-lint-action@v1.4.1 + uses: MorrisonCole/pr-lint-action@v1.6.1 with: title-regex: '^([\w-/]+): \w+' on-failed-regex-fail-action: false @@ -25,8 +25,8 @@ jobs: name: Validate gradle wrapper runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - uses: gradle/wrapper-validation-action@v1.0.3 + - uses: actions/checkout@v2.4.2 + - uses: gradle/wrapper-validation-action@v1.0.4 build: name: Build @@ -34,19 +34,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - uses: actions/cache@v2.1.3 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} - restore-keys: | - ${{ runner.os }}-gradle- + - uses: actions/checkout@v2.4.2 - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.4.3 + uses: actions/setup-java@v3.1.1 with: + distribution: 'adopt' java-version: 11 + cache: 'gradle' - name: Assembling run: ./gradlew assemble --console=plain - name: Building @@ -58,19 +54,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - uses: actions/cache@v2.1.3 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} - restore-keys: | - ${{ runner.os }}-gradle- + - uses: actions/checkout@v2.4.2 - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.4.3 + uses: actions/setup-java@v3.1.1 with: + distribution: 'adopt' java-version: 11 + cache: 'gradle' - name: Assembling run: ./gradlew assemble --console=plain - name: Testing @@ -82,19 +74,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - uses: actions/cache@v2.1.3 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} - restore-keys: | - ${{ runner.os }}-gradle- + - uses: actions/checkout@v2.4.2 - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.4.3 + uses: actions/setup-java@v3.1.1 with: + distribution: 'adopt' java-version: 11 + cache: 'gradle' - name: Assembling run: ./gradlew assemble --console=plain - name: Checking code conventions @@ -106,19 +94,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - uses: actions/cache@v2.1.3 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} - restore-keys: | - ${{ runner.os }}-gradle- + - uses: actions/checkout@v2.4.2 - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.4.3 + uses: actions/setup-java@v3.1.1 with: + distribution: 'adopt' java-version: 11 + cache: 'gradle' - name: Assembling run: ./gradlew assemble --console=plain - name: Checking code conventions @@ -132,6 +116,6 @@ jobs: steps: - name: Approve pull request if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS' - uses: hmarr/auto-approve-action@v2.0.0 + uses: hmarr/auto-approve-action@v2.2.1 with: github-token: ${{ secrets.Owain }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 76c477818d..84adc7c302 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -11,19 +11,15 @@ jobs: name: Build steps: - - uses: actions/checkout@v2.3.4 - - uses: actions/cache@v2.1.3 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} - restore-keys: | - ${{ runner.os }}-gradle- + - uses: actions/checkout@v2.4.2 - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.4.3 + uses: actions/setup-java@v3.1.1 with: + distribution: 'adopt' java-version: 11 + cache: 'gradle' - name: Assembling run: ./gradlew assemble --console=plain - name: Building @@ -34,19 +30,15 @@ jobs: name: Test steps: - - uses: actions/checkout@v2.3.4 - - uses: actions/cache@v2.1.3 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} - restore-keys: | - ${{ runner.os }}-gradle- + - uses: actions/checkout@v2.4.2 - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.4.3 + uses: actions/setup-java@v3.1.1 with: + distribution: 'adopt' java-version: 11 + cache: 'gradle' - name: Assembling run: ./gradlew assemble --console=plain - name: Testing @@ -57,19 +49,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - uses: actions/cache@v2.1.3 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} - restore-keys: | - ${{ runner.os }}-gradle- + - uses: actions/checkout@v2.4.2 - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.4.3 + uses: actions/setup-java@v3.1.1 with: + distribution: 'adopt' java-version: 11 + cache: 'gradle' - name: Assembling run: ./gradlew assemble --console=plain - name: Checking code conventions @@ -80,19 +68,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - uses: actions/cache@v2.1.3 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} - restore-keys: | - ${{ runner.os }}-gradle- + - uses: actions/checkout@v2.4.2 - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.4.3 + uses: actions/setup-java@v3.1.1 with: + distribution: 'adopt' java-version: 11 + cache: 'gradle' - name: Assembling run: ./gradlew assemble --console=plain - name: Checking code conventions diff --git a/.github/workflows/scraper.yml b/.github/workflows/scraper.yml index e9827dbe88..508566046d 100644 --- a/.github/workflows/scraper.yml +++ b/.github/workflows/scraper.yml @@ -9,23 +9,18 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.4.2 with: repository: open-osrs/cache-client ref: master path: cache-client - - uses: actions/cache@v2.1.3 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Set up JDK 11 - uses: actions/setup-java@v1.4.3 + uses: actions/setup-java@v3.1.1 with: + distribution: 'adopt' java-version: 11 + cache: 'gradle' - name: Make gradlew executable run: chmod +x ./gradlew @@ -39,7 +34,7 @@ jobs: run: ./gradlew download --console=plain working-directory: cache-client - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.4.2 with: repository: open-osrs/runelite ref: master