diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 05:50:19 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 05:50:19 +0000 |
| commit | b6a97bcbb33b667a7ee4acb2eb8e482333e95a1b (patch) | |
| tree | 89830d7d7c2cd02e552447883d02800d56cdf323 /uAssets/.github/workflows | |
| parent | Releasing progress-linux version 1.55.0+dfsg-1~progress7.99u1. (diff) | |
| download | ublock-origin-b6a97bcbb33b667a7ee4acb2eb8e482333e95a1b.tar.xz ublock-origin-b6a97bcbb33b667a7ee4acb2eb8e482333e95a1b.zip | |
Merging upstream version 1.57.0+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'uAssets/.github/workflows')
| -rw-r--r-- | uAssets/.github/workflows/main.yml | 2 | ||||
| -rw-r--r-- | uAssets/.github/workflows/on-youtube-issue.yml | 4 | ||||
| -rw-r--r-- | uAssets/.github/workflows/update-easylist.yml | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/uAssets/.github/workflows/main.yml b/uAssets/.github/workflows/main.yml index 66d82d4..53a8e8f 100644 --- a/uAssets/.github/workflows/main.yml +++ b/uAssets/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone uAssets - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: gh-pages - name: Copy filter lists to gh-pages diff --git a/uAssets/.github/workflows/on-youtube-issue.yml b/uAssets/.github/workflows/on-youtube-issue.yml index d9b1d7d..f197c16 100644 --- a/uAssets/.github/workflows/on-youtube-issue.yml +++ b/uAssets/.github/workflows/on-youtube-issue.yml @@ -1,4 +1,4 @@ -name: Triage Youtube issues +name: Triage YouTube issues on: issues: @@ -8,7 +8,7 @@ jobs: check-if-youtube: name: Close as duplicate runs-on: ubuntu-latest - if: startsWith(github.event.issue.title, 'youtube.com:') + if: startsWith(github.event.issue.title, 'youtube.com:') || startsWith(github.event.issue.title, 'music.youtube.com:') permissions: issues: write steps: diff --git a/uAssets/.github/workflows/update-easylist.yml b/uAssets/.github/workflows/update-easylist.yml index 4ae2b72..133f097 100644 --- a/uAssets/.github/workflows/update-easylist.yml +++ b/uAssets/.github/workflows/update-easylist.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone uAssets - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Assemble Easylist assets run: | ./tools/make-easylist.sh @@ -28,5 +28,6 @@ jobs: git config user.email "<>" git add -u thirdparties/ git commit -m "Update Easylist assets" + git pull --rebase origin master git push origin master fi |