From d7f7acb219aebaf392d2083caebb2d569ed1aad9 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Sun, 8 Mar 2020 23:20:41 -0400 Subject: [PATCH 1/8] Fixed release action --- .github/workflows/{ci.yml => ci/action.yml} | 0 .github/workflows/release.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{ci.yml => ci/action.yml} (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci/action.yml similarity index 100% rename from .github/workflows/ci.yml rename to .github/workflows/ci/action.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe17a089..8ee5baf0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: # Build Artifacts - uses: actions/checkout@v1 - name: Build Artifacts - uses: ./.github/workflows/ci.yml + uses: ./.github/workflows/ci/ # Upload each release asset - name: Upload to release From 5ad694af65040a6224841143678d17b6f5b2217c Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Sun, 8 Mar 2020 23:26:46 -0400 Subject: [PATCH 2/8] Increase version number --- manifest/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest/manifest.json b/manifest/manifest.json index 81387422..02243448 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "__MSG_Name__", - "version": "1.2.18", + "version": "1.2.19", "default_locale": "en", "description": "__MSG_Description__", "content_scripts": [{ From 73e8926444563eb89a7396c7a70fd33b0a590389 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 9 Mar 2020 10:43:13 -0400 Subject: [PATCH 3/8] Start skip schedule from skip time to prevent slow video updates from breaking it. --- src/content.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content.ts b/src/content.ts index 16f732ea..8488242b 100644 --- a/src/content.ts +++ b/src/content.ts @@ -463,7 +463,7 @@ function startSponsorSchedule(currentTime?: number): void { skipToTime(video, skipInfo.index, skipInfo.array, skipInfo.openNotice); } - startSponsorSchedule(); + startSponsorSchedule(skipTime[1]); }; if (timeUntilSponsor <= 0) { From d5f41bf4add31820f6e9acb0845b9473a05c80f5 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 9 Mar 2020 10:49:50 -0400 Subject: [PATCH 4/8] Fixed CI --- .github/ci.yml | 13 +++++++++++++ .github/workflows/ci/action.yml | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .github/ci.yml diff --git a/.github/ci.yml b/.github/ci.yml new file mode 100644 index 00000000..35836a8f --- /dev/null +++ b/.github/ci.yml @@ -0,0 +1,13 @@ +name: CI + +on: [push, pull_request] + +jobs: + + build: + name: Create artifacts + runs-on: ubuntu-latest + + steps: + - uses: ./.github/workflows/ci/ + diff --git a/.github/workflows/ci/action.yml b/.github/workflows/ci/action.yml index 60e01530..e1dc35a0 100644 --- a/.github/workflows/ci/action.yml +++ b/.github/workflows/ci/action.yml @@ -1,7 +1,5 @@ name: CI -on: [push, pull_request] - jobs: build: From 44ca8d47d827ca60ed1861129aaf71cc51402ae9 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 9 Mar 2020 10:51:26 -0400 Subject: [PATCH 5/8] Moved CI into the right place --- .github/{ => workflows}/ci.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/ci.yml (100%) diff --git a/.github/ci.yml b/.github/workflows/ci.yml similarity index 100% rename from .github/ci.yml rename to .github/workflows/ci.yml From d6410663129f8216d9b470a23bbfacf776dd789d Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 9 Mar 2020 10:52:43 -0400 Subject: [PATCH 6/8] Checkout in CI --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35836a8f..0f0211e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,5 +9,6 @@ jobs: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v1 - uses: ./.github/workflows/ci/ From 7b5703aa040d756e729be25a1297521dc4173e47 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 9 Mar 2020 10:56:06 -0400 Subject: [PATCH 7/8] Fixed action format --- .github/workflows/ci/action.yml | 102 ++++++++++++++++---------------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/.github/workflows/ci/action.yml b/.github/workflows/ci/action.yml index e1dc35a0..b2ac5b87 100644 --- a/.github/workflows/ci/action.yml +++ b/.github/workflows/ci/action.yml @@ -1,60 +1,58 @@ name: CI -jobs: +runs: + name: Create artifacts + runs-on: ubuntu-latest - build: - name: Create artifacts - runs-on: ubuntu-latest + steps: + # Initialization + - uses: actions/checkout@v1 + - uses: actions/setup-node@v1 + - run: npm install + - name: Copy configuration + run: cp config.json.example config.json - steps: - # Initialization - - uses: actions/checkout@v1 - - uses: actions/setup-node@v1 - - run: npm install - - name: Copy configuration - run: cp config.json.example config.json + # Create Chrome artifacts + - name: Create Chrome artifacts + run: npm run build:chrome + - uses: actions/upload-artifact@v1 + with: + name: ChromeExtension + path: dist + - run: mkdir ./builds + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/ChromeExtension.zip ./dist - # Create Chrome artifacts - - name: Create Chrome artifacts - run: npm run build:chrome - - uses: actions/upload-artifact@v1 - with: - name: ChromeExtension - path: dist - - run: mkdir ./builds - - uses: montudor/action-zip@v0.1.0 - with: - args: zip -qq -r ./builds/ChromeExtension.zip ./dist + # Create Firefox artifacts + - name: Create Firefox artifacts + run: npm run build:firefox + - uses: actions/upload-artifact@v1 + with: + name: FirefoxExtension + path: dist + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/FirefoxExtension.zip ./dist - # Create Firefox artifacts - - name: Create Firefox artifacts - run: npm run build:firefox - - uses: actions/upload-artifact@v1 - with: - name: FirefoxExtension - path: dist - - uses: montudor/action-zip@v0.1.0 - with: - args: zip -qq -r ./builds/FirefoxExtension.zip ./dist + # 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@v1 + with: + name: ChromeExtensionBeta + path: dist + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/ChromeExtensionBeta.zip ./dist - # 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@v1 - with: - name: ChromeExtensionBeta - path: dist - - uses: montudor/action-zip@v0.1.0 - with: - args: zip -qq -r ./builds/ChromeExtensionBeta.zip ./dist - - - name: Create Firefox Beta artifacts - run: npm run build:firefox -- --env.stream=beta - - uses: actions/upload-artifact@v1 - with: - name: FirefoxExtensionBeta - path: dist - - uses: montudor/action-zip@v0.1.0 - with: - args: zip -qq -r ./builds/FirefoxExtensionBeta.zip ./dist + - name: Create Firefox Beta artifacts + run: npm run build:firefox -- --env.stream=beta + - uses: actions/upload-artifact@v1 + with: + name: FirefoxExtensionBeta + path: dist + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/FirefoxExtensionBeta.zip ./dist From f63abb053d12d7ccdd09ce52f5a74f45f51e134f Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 9 Mar 2020 11:02:14 -0400 Subject: [PATCH 8/8] Revert to only using workflows --- .github/workflows/ci.yml | 52 +++++++++++++++++++++++++++-- .github/workflows/ci/action.yml | 58 --------------------------------- .github/workflows/release.yml | 52 +++++++++++++++++++++++++++-- 3 files changed, 99 insertions(+), 63 deletions(-) delete mode 100644 .github/workflows/ci/action.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f0211e9..60e01530 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,54 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - uses: ./.github/workflows/ci/ + # Initialization + - uses: actions/checkout@v1 + - uses: actions/setup-node@v1 + - run: npm install + - name: Copy configuration + run: cp config.json.example config.json + + # Create Chrome artifacts + - name: Create Chrome artifacts + run: npm run build:chrome + - uses: actions/upload-artifact@v1 + with: + name: ChromeExtension + path: dist + - run: mkdir ./builds + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/ChromeExtension.zip ./dist + + # Create Firefox artifacts + - name: Create Firefox artifacts + run: npm run build:firefox + - uses: actions/upload-artifact@v1 + with: + name: FirefoxExtension + path: dist + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/FirefoxExtension.zip ./dist + + # 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@v1 + with: + name: ChromeExtensionBeta + path: dist + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/ChromeExtensionBeta.zip ./dist + + - name: Create Firefox Beta artifacts + run: npm run build:firefox -- --env.stream=beta + - uses: actions/upload-artifact@v1 + with: + name: FirefoxExtensionBeta + path: dist + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/FirefoxExtensionBeta.zip ./dist diff --git a/.github/workflows/ci/action.yml b/.github/workflows/ci/action.yml deleted file mode 100644 index b2ac5b87..00000000 --- a/.github/workflows/ci/action.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: CI - -runs: - name: Create artifacts - runs-on: ubuntu-latest - - steps: - # Initialization - - uses: actions/checkout@v1 - - uses: actions/setup-node@v1 - - run: npm install - - name: Copy configuration - run: cp config.json.example config.json - - # Create Chrome artifacts - - name: Create Chrome artifacts - run: npm run build:chrome - - uses: actions/upload-artifact@v1 - with: - name: ChromeExtension - path: dist - - run: mkdir ./builds - - uses: montudor/action-zip@v0.1.0 - with: - args: zip -qq -r ./builds/ChromeExtension.zip ./dist - - # Create Firefox artifacts - - name: Create Firefox artifacts - run: npm run build:firefox - - uses: actions/upload-artifact@v1 - with: - name: FirefoxExtension - path: dist - - uses: montudor/action-zip@v0.1.0 - with: - args: zip -qq -r ./builds/FirefoxExtension.zip ./dist - - # 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@v1 - with: - name: ChromeExtensionBeta - path: dist - - uses: montudor/action-zip@v0.1.0 - with: - args: zip -qq -r ./builds/ChromeExtensionBeta.zip ./dist - - - name: Create Firefox Beta artifacts - run: npm run build:firefox -- --env.stream=beta - - uses: actions/upload-artifact@v1 - with: - name: FirefoxExtensionBeta - path: dist - - uses: montudor/action-zip@v0.1.0 - with: - args: zip -qq -r ./builds/FirefoxExtensionBeta.zip ./dist - diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ee5baf0..2e6d2a33 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,10 +9,56 @@ jobs: runs-on: ubuntu-latest steps: - # Build Artifacts + # Initialization - uses: actions/checkout@v1 - - name: Build Artifacts - uses: ./.github/workflows/ci/ + - uses: actions/setup-node@v1 + - run: npm install + - name: Copy configuration + run: cp config.json.example config.json + + # Create Chrome artifacts + - name: Create Chrome artifacts + run: npm run build:chrome + - uses: actions/upload-artifact@v1 + with: + name: ChromeExtension + path: dist + - run: mkdir ./builds + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/ChromeExtension.zip ./dist + + # Create Firefox artifacts + - name: Create Firefox artifacts + run: npm run build:firefox + - uses: actions/upload-artifact@v1 + with: + name: FirefoxExtension + path: dist + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/FirefoxExtension.zip ./dist + + # 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@v1 + with: + name: ChromeExtensionBeta + path: dist + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/ChromeExtensionBeta.zip ./dist + + - name: Create Firefox Beta artifacts + run: npm run build:firefox -- --env.stream=beta + - uses: actions/upload-artifact@v1 + with: + name: FirefoxExtensionBeta + path: dist + - uses: montudor/action-zip@v0.1.0 + with: + args: zip -qq -r ./builds/FirefoxExtensionBeta.zip ./dist # Upload each release asset - name: Upload to release