aboutsummaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/deploy_snapshot.yml8
-rw-r--r--.github/workflows/pull_request.yml8
-rw-r--r--.github/workflows/release.yml22
-rw-r--r--.github/workflows/update_publicsuffix_data.yml24
-rw-r--r--.github/workflows/validate_wrapper.yml2
5 files changed, 34 insertions, 30 deletions
diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml
index 621f12ef..3bb5d9c8 100644
--- a/.github/workflows/deploy_snapshot.yml
+++ b/.github/workflows/deploy_snapshot.yml
@@ -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') }}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 19e05638..9f07976a 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -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') }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5f03c588..c6cdf753 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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
diff --git a/.github/workflows/update_publicsuffix_data.yml b/.github/workflows/update_publicsuffix_data.yml
index 3481e7aa..27a2ab14 100644
--- a/.github/workflows/update_publicsuffix_data.yml
+++ b/.github/workflows/update_publicsuffix_data.yml
@@ -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: 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: peter-evans/create-pull-request@v2
+ 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
diff --git a/.github/workflows/validate_wrapper.yml b/.github/workflows/validate_wrapper.yml
index e6405294..8781750e 100644
--- a/.github/workflows/validate_wrapper.yml
+++ b/.github/workflows/validate_wrapper.yml
@@ -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
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-23 15:23:51 +0000