github: update all Actions (#934)

Switch publicsuffix update workflow to use the same pull-request action
as release drafter.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya
2020-07-15 00:08:34 +05:30
committed by GitHub
parent 1d7ec5ba6f
commit 06b226ae8d
5 changed files with 35 additions and 31 deletions

View File

@@ -10,7 +10,7 @@ jobs:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Checkout repository
uses: actions/checkout@v1
uses: actions/checkout@v2
- name: Decrypt secrets
run: release/signing-setup.sh "$ENCRYPT_KEY"
@@ -24,7 +24,7 @@ jobs:
run: ./.github/checksum.sh checksum.txt
- name: Cache gradle modules
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.gradle/caches/modules-2
key: ${{ runner.os }}-gradlemodules-${{ hashFiles('checksum.txt') }}
@@ -32,7 +32,7 @@ jobs:
${{ runner.os }}-gradlemodules-
- name: Cache gradle jars
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.gradle/caches/jars-3
key: ${{ runner.os }}-gradlejars-${{ hashFiles('checksum.txt') }}
@@ -40,7 +40,7 @@ jobs:
${{ runner.os }}-gradlejars-
- name: Cache gradle build
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.gradle/caches/build-cache-1
key: ${{ runner.os }}-gradlebuildcache-${{ hashFiles('checksum.txt') }}

View File

@@ -28,7 +28,7 @@ jobs:
- name: Checkout repository
if: ${{ steps.service-changed.outputs.result == 'true' }}
uses: actions/checkout@v1
uses: actions/checkout@v2
- name: Copy CI gradle.properties
if: ${{ steps.service-changed.outputs.result == 'true' }}
@@ -40,7 +40,7 @@ jobs:
- name: Cache gradle modules
if: ${{ steps.service-changed.outputs.result == 'true' }}
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.gradle/caches/modules-2
key: ${{ runner.os }}-gradlemodules-${{ hashFiles('checksum.txt') }}
@@ -49,7 +49,7 @@ jobs:
- name: Cache gradle jars
if: ${{ steps.service-changed.outputs.result == 'true' }}
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.gradle/caches/jars-3
key: ${{ runner.os }}-gradlejars-${{ hashFiles('checksum.txt') }}
@@ -58,7 +58,7 @@ jobs:
- name: Cache gradle build
if: ${{ steps.service-changed.outputs.result == 'true' }}
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.gradle/caches/build-cache-1
key: ${{ runner.os }}-gradlebuildcache-${{ hashFiles('checksum.txt') }}

View File

@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v1
uses: actions/checkout@v2
- name: Decrypt secrets
run: release/signing-setup.sh "$ENCRYPT_KEY"
@@ -24,7 +24,7 @@ jobs:
run: ./.github/checksum.sh checksum.txt
- name: Cache gradle modules
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.gradle/caches/modules-2
key: ${{ runner.os }}-gradlemodules-${{ hashFiles('checksum.txt') }}
@@ -32,7 +32,7 @@ jobs:
${{ runner.os }}-gradlemodules-
- name: Cache gradle jars
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.gradle/caches/jars-3
key: ${{ runner.os }}-gradlejars-${{ hashFiles('checksum.txt') }}
@@ -40,7 +40,7 @@ jobs:
${{ runner.os }}-gradlejars-
- name: Cache gradle build
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.gradle/caches/build-cache-1
key: ${{ runner.os }}-gradlebuildcache-${{ hashFiles('checksum.txt') }}
@@ -54,19 +54,19 @@ jobs:
run: ./gradlew :app:assembleFreeRelease :app:assembleNonFreeRelease :app:bundleNonFreeRelease
- name: Upload non-free release APK
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v2
with:
name: APS Non-Free Release APK
path: app/build/outputs/apk/nonFree/release/app-release.apk
- name: Upload non-free release Bundle
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v2
with:
name: APS Non-Free Release Bundle
path: app/build/outputs/bundle/nonFree/release/app-release.aab
- name: Upload free release APK
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v2
with:
name: APS Free Release APK
path: app/build/outputs/apk/free/release/app-release.apk
@@ -81,22 +81,22 @@ jobs:
needs: build
steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v2
- name: Get Non-Free Release APK
uses: actions/download-artifact@v1
uses: actions/download-artifact@v2
with:
name: APS Non-Free Release APK
path: artifacts/nonFree
- name: Get Non-Free Bundle
uses: actions/download-artifact@v1
uses: actions/download-artifact@v2
with:
name: APS Non-Free Release Bundle
path: artifacts/nonFree
- name: Get Free Release APK
uses: actions/download-artifact@v1
uses: actions/download-artifact@v2
with:
name: APS Free Release APK
path: artifacts/free

View File

@@ -8,22 +8,26 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Download new publicsuffix data
run: curl -L https://github.com/mozilla-mobile/android-components/raw/master/components/lib/publicsuffixlist/src/main/assets/publicsuffixes -o app/src/main/assets/publicsuffixes
- name: Compare list changes
run: if [[ $(git diff --binary --stat) != '' ]]; then echo "::set-env name=UPDATED::true"; fi
- name: Create update PR
uses: peter-evans/create-pull-request@v2
- name: Commit changes
if: env.UPDATED == 'true'
run: |
git checkout -b bot/update-psl
git add app/src/main/assets/publicsuffixes
git commit --message "Update Public Suffix List data'
- name: Create update PR
uses: thomaseizinger/create-pull-request@1.0.0
if: env.UPDATED == 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_PERSONAL_TOKEN }}
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: 'Update Public Suffix List data'
committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
head: bot/update-psl
base: develop
title: 'Update Public Suffix List data'
body: 'Updates Public Suffix List from https://publicsuffix.org/list/'
assignees: msfjarvis
labels: PSL
branch: bot/update-psl

View File

@@ -13,4 +13,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- uses: gradle/wrapper-validation-action@v1.0.3