From 6ab88e9fa03315a5645b78a5b84f2e39740a823f Mon Sep 17 00:00:00 2001 From: Brian Choromanski Date: Tue, 1 Oct 2024 22:31:43 -0400 Subject: [PATCH 1/5] Updated checkout to v4 --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/update-oss-attribution.yml | 2 +- .github/workflows/updateInvidous.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b5541b19f..ea2357b012 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: steps: # Initialization - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - uses: actions/setup-node@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 21108d7a1c..f1a1f6ac3c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: steps: # Initialization - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - uses: actions/setup-node@v3 diff --git a/.github/workflows/update-oss-attribution.yml b/.github/workflows/update-oss-attribution.yml index 5c45e6e37b..f1bc56d9e2 100644 --- a/.github/workflows/update-oss-attribution.yml +++ b/.github/workflows/update-oss-attribution.yml @@ -12,7 +12,7 @@ jobs: update-oss: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - uses: actions/setup-node@v3 diff --git a/.github/workflows/updateInvidous.yml b/.github/workflows/updateInvidous.yml index 0dcf556c71..3be1203aec 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 From 61f5d7a9027db8f03210d3cdbdabe6c6be6fbd3d Mon Sep 17 00:00:00 2001 From: Brian Choromanski Date: Tue, 1 Oct 2024 22:32:28 -0400 Subject: [PATCH 2/5] Updated setup-node to v4 --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/tests.yml | 2 +- .github/workflows/update-oss-attribution.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea2357b012..e0ecb6b1a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: '18' - run: npm ci diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1a1f6ac3c..0476b5d027 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: '18' - name: Copy configuration diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8773c147ba..fd1ae51482 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v3 with: submodules: recursive - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: '18' - run: npm ci diff --git a/.github/workflows/update-oss-attribution.yml b/.github/workflows/update-oss-attribution.yml index f1bc56d9e2..72cf8ca171 100644 --- a/.github/workflows/update-oss-attribution.yml +++ b/.github/workflows/update-oss-attribution.yml @@ -15,7 +15,7 @@ jobs: - 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 From 7cd70899808d31a0e455903d3f7343c8b95849f4 Mon Sep 17 00:00:00 2001 From: Brian Choromanski Date: Tue, 1 Oct 2024 22:34:11 -0400 Subject: [PATCH 3/5] Updated upload-artifact to v4 --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- .github/workflows/tests.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0ecb6b1a0..83fc0623ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 0476b5d027..54a0ddaec8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 fd1ae51482..45611d9db3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 From 443fb1f448184f74f08e8575f675c0bcac64d877 Mon Sep 17 00:00:00 2001 From: Brian Choromanski Date: Tue, 1 Oct 2024 22:43:30 -0400 Subject: [PATCH 4/5] Updated peter-evans/create-pull-request to v7 --- .github/workflows/update-oss-attribution.yml | 2 +- .github/workflows/updateInvidous.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-oss-attribution.yml b/.github/workflows/update-oss-attribution.yml index 72cf8ca171..38679fe60a 100644 --- a/.github/workflows/update-oss-attribution.yml +++ b/.github/workflows/update-oss-attribution.yml @@ -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 3be1203aec..509e4cfd37 100644 --- a/.github/workflows/updateInvidous.yml +++ b/.github/workflows/updateInvidous.yml @@ -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 From 5163b3362f17cb7da9b8434f9e5fe92eab93db17 Mon Sep 17 00:00:00 2001 From: Brian Choromanski Date: Tue, 1 Oct 2024 22:46:24 -0400 Subject: [PATCH 5/5] Missed one checkout --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 45611d9db3..dac0211fb5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: steps: # Initialization - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - uses: actions/setup-node@v4