aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAjay <[email protected]>2024-10-02 03:05:38 -0400
committerAjay <[email protected]>2024-10-02 03:05:38 -0400
commit2691dc5df5d503259a98e3e29bc69b0883561ab0 (patch)
tree7e58017d3f39ca86e66216d9323c2b14af7fd066
parent31ef4f39bfba304578533db64ed7a09ae9457ce9 (diff)
parent4044a22e0490139b14c05b7d3bf54ee33ed143ac (diff)
downloadSponsorBlock-2691dc5df5d503259a98e3e29bc69b0883561ab0.tar.gz
SponsorBlock-2691dc5df5d503259a98e3e29bc69b0883561ab0.zip
Merge branch 'master' of https://github.com/ajayyy/SponsorBlock5.9.4
-rw-r--r--.github/workflows/ci.yml12
-rw-r--r--.github/workflows/release.yml8
-rw-r--r--.github/workflows/tests.yml6
-rw-r--r--.github/workflows/update-oss-attribution.yml6
-rw-r--r--.github/workflows/updateInvidous.yml4
5 files changed, 18 insertions, 18 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b5541b1..83fc0623 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,10 +10,10 @@ jobs:
steps:
# Initialization
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
submodules: recursive
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
with:
node-version: '18'
- run: npm ci
@@ -27,7 +27,7 @@ jobs:
# Create Chrome artifacts
- name: Create Chrome artifacts
run: npm run build:chrome
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
with:
name: ChromeExtension
path: dist
@@ -39,7 +39,7 @@ jobs:
# Create Firefox artifacts
- name: Create Firefox artifacts
run: npm run build:firefox
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
with:
name: FirefoxExtension
path: dist
@@ -50,7 +50,7 @@ jobs:
# Create Beta artifacts (Builds with the name changed to beta)
- name: Create Chrome Beta artifacts
run: npm run build:chrome -- --env stream=beta
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
with:
name: ChromeExtensionBeta
path: dist
@@ -60,7 +60,7 @@ jobs:
- name: Create Firefox Beta artifacts
run: npm run build:firefox -- --env stream=beta
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
with:
name: FirefoxExtensionBeta
path: dist
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 21108d7a..54a0ddae 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,10 +12,10 @@ jobs:
steps:
# Initialization
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
submodules: recursive
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
with:
node-version: '18'
- name: Copy configuration
@@ -108,7 +108,7 @@ jobs:
# Firefox Beta
- name: Create Firefox Beta artifacts
run: npm run build:firefox -- --env stream=beta
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
with:
name: FirefoxExtensionBeta
path: dist
@@ -125,7 +125,7 @@ jobs:
run: sudo apt-get install rename
- name: Rename signed file
run: cd ./web-ext-artifacts ; rename 's/.*/FirefoxSignedInstaller.xpi/' *
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
with:
name: FirefoxExtensionSigned.xpi
path: ./web-ext-artifacts/FirefoxSignedInstaller.xpi
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8773c147..dac0211f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,10 +9,10 @@ jobs:
steps:
# Initialization
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
submodules: recursive
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
with:
node-version: '18'
- run: npm ci
@@ -25,7 +25,7 @@ jobs:
- name: Upload results on fail
if: ${{ failure() }}
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: Test Results
path: ./test-results \ No newline at end of file
diff --git a/.github/workflows/update-oss-attribution.yml b/.github/workflows/update-oss-attribution.yml
index 5c45e6e3..38679fe6 100644
--- a/.github/workflows/update-oss-attribution.yml
+++ b/.github/workflows/update-oss-attribution.yml
@@ -12,10 +12,10 @@ jobs:
update-oss:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
submodules: recursive
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
with:
node-version: '18'
- name: Install and generate attribution
@@ -29,7 +29,7 @@ jobs:
cd ci && npx ts-node prettify.ts
- name: Create pull request to update list
- uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
+ uses: peter-evans/create-pull-request@v7
# v4.2.3
with:
commit-message: Update OSS Attribution
diff --git a/.github/workflows/updateInvidous.yml b/.github/workflows/updateInvidous.yml
index 0dcf556c..509e4cfd 100644
--- a/.github/workflows/updateInvidous.yml
+++ b/.github/workflows/updateInvidous.yml
@@ -8,7 +8,7 @@ jobs:
check-list:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
submodules: recursive
- name: Download instance lists
@@ -21,7 +21,7 @@ jobs:
run: npm run ci:invidious
- name: Create pull request to update list
- uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
+ uses: peter-evans/create-pull-request@v7
# v4.2.3
with:
commit-message: Update Invidious List