From 664649f93d32d0192c39734606d9ef92532ddb24 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Thu, 14 Dec 2023 16:42:08 -0500 Subject: [PATCH 01/20] point workflows at master instead of unstable --- .github/workflows/automations.yml | 2 -- .github/workflows/build-dev.yml | 4 +--- .github/workflows/build-docs.yml | 2 +- .github/workflows/deploy-api-docs.yml | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/automations.yml b/.github/workflows/automations.yml index 20210f281..175a134f7 100644 --- a/.github/workflows/automations.yml +++ b/.github/workflows/automations.yml @@ -6,8 +6,6 @@ concurrency: on: push: - branches: - - unstable pull_request_target: jobs: diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 759e7bd07..9149c29b7 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -2,11 +2,9 @@ name: build-dev on: pull_request: - branches-ignore: - - master push: branches: - - unstable + - master jobs: dev: diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index b380a1519..1f73cd514 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -3,7 +3,7 @@ name: build-docs on: push: branches: - - unstable + - master jobs: docs: diff --git a/.github/workflows/deploy-api-docs.yml b/.github/workflows/deploy-api-docs.yml index b4a6787f1..eaf938519 100644 --- a/.github/workflows/deploy-api-docs.yml +++ b/.github/workflows/deploy-api-docs.yml @@ -3,7 +3,7 @@ name: deploy-api-docs on: push: - branches: ["unstable"] + branches: ["master"] paths: ["docs/**"] # only run if the docs are updated # Allows you to run this workflow manually from the Actions tab From 713fb5b2a59b9df730dfd228bff01d6bf95503d9 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 00:50:45 -0500 Subject: [PATCH 02/20] run version-check and build-prod when PR is tagged `release-prep`. also build-prod on push --- .github/workflows/build-prod.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml index 096a6a5cf..0d9b4f050 100644 --- a/.github/workflows/build-prod.yml +++ b/.github/workflows/build-prod.yml @@ -2,20 +2,22 @@ name: build-prod on: pull_request: - branches: - - master + types: [labeled, opened, synchronize, reopened] push: branches: - master + - "*.*.z" jobs: version-check: + if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') runs-on: ubuntu-latest steps: + # checkout the branch that triggered the workflow - name: Checkout master (the latest release) uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: - ref: master + ref: ${GITHUB_REF##*/} # this only works with branches that don't include / - name: Install jq to parse json uses: awalsh128/cache-apt-pkgs-action@latest with: @@ -59,6 +61,7 @@ jobs: if: (env.newManVersion != env.newPackVersion) || (env.newManVersion != env.newMakeVersion) run: exit 1 prod: + if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release-prep') }} runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 From 074c8b66ef413aab3f1fcd328f7bf18d011f37b1 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 00:55:25 -0500 Subject: [PATCH 03/20] run build-dev on *.*.z branch pushes --- .github/workflows/build-dev.yml | 1 + .github/workflows/lint.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 9149c29b7..5436bc9dd 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -5,6 +5,7 @@ on: push: branches: - master + - "*.*.z" jobs: dev: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 349ee30af..1eebdf85c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -2,7 +2,6 @@ name: lint on: pull_request: - jobs: brightscript: runs-on: ubuntu-latest @@ -79,4 +78,4 @@ jobs: - name: Install roku package dependencies run: npx ropm install - name: Check markdown files for spelling errors - run: npm run lint-spelling \ No newline at end of file + run: npm run lint-spelling From fb4d103a0c133bf749dd735c284a013f857021f7 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 01:03:59 -0500 Subject: [PATCH 04/20] remove unneeded comment --- .github/workflows/build-prod.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml index 0d9b4f050..5a6e6a967 100644 --- a/.github/workflows/build-prod.yml +++ b/.github/workflows/build-prod.yml @@ -13,8 +13,7 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') runs-on: ubuntu-latest steps: - # checkout the branch that triggered the workflow - - name: Checkout master (the latest release) + - name: Checkout the branch that triggered the workflow uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: ref: ${GITHUB_REF##*/} # this only works with branches that don't include / From e9dffcf317f8e229269e677874d2a978f8ace7db Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 01:10:46 -0500 Subject: [PATCH 05/20] fix version-check bug --- .github/workflows/build-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml index 5a6e6a967..7ee286fa7 100644 --- a/.github/workflows/build-prod.yml +++ b/.github/workflows/build-prod.yml @@ -10,7 +10,7 @@ on: jobs: version-check: - if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') + if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} runs-on: ubuntu-latest steps: - name: Checkout the branch that triggered the workflow From a33a67d0dff028f23f459f4e2a9a96c5ec55b980 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 01:17:57 -0500 Subject: [PATCH 06/20] save branch name to env --- .github/workflows/build-prod.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml index 7ee286fa7..d7098b73b 100644 --- a/.github/workflows/build-prod.yml +++ b/.github/workflows/build-prod.yml @@ -13,10 +13,12 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} runs-on: ubuntu-latest steps: + - name: Save branch name + run: echo "branch=${GITHUB_REF##*/}" >> $GITHUB_ENV # this only works with branches that don't include / - name: Checkout the branch that triggered the workflow uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: - ref: ${GITHUB_REF##*/} # this only works with branches that don't include / + ref: env.branch - name: Install jq to parse json uses: awalsh128/cache-apt-pkgs-action@latest with: From 8f560a3068057e965347163b301aafdfe0bdd2c7 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 01:26:17 -0500 Subject: [PATCH 07/20] fix version-check bug --- .github/workflows/build-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml index d7098b73b..212dcb533 100644 --- a/.github/workflows/build-prod.yml +++ b/.github/workflows/build-prod.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Save branch name - run: echo "branch=${GITHUB_REF##*/}" >> $GITHUB_ENV # this only works with branches that don't include / + run: echo "branch=${GITHUB_BASE_REF}" >> $GITHUB_ENV # this only works with branches that don't include / - name: Checkout the branch that triggered the workflow uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: From b9a74863a5260b52724d31171065ef38c1830ef7 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 01:33:38 -0500 Subject: [PATCH 08/20] fix version-check bug --- .github/workflows/build-prod.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml index 212dcb533..2a799eb59 100644 --- a/.github/workflows/build-prod.yml +++ b/.github/workflows/build-prod.yml @@ -13,12 +13,10 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} runs-on: ubuntu-latest steps: - - name: Save branch name - run: echo "branch=${GITHUB_BASE_REF}" >> $GITHUB_ENV # this only works with branches that don't include / - - name: Checkout the branch that triggered the workflow + - name: Checkout the branch this PR wants to update uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: - ref: env.branch + ref: ${{ GITHUB_BASE_REF }} - name: Install jq to parse json uses: awalsh128/cache-apt-pkgs-action@latest with: From 8580d8b9d8592a3430e00d58fe672f310fff8c3e Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 01:51:45 -0500 Subject: [PATCH 09/20] move release-prep to it's own file --- .github/workflows/build-prod.yml | 53 +------------------- .github/workflows/release-prep.yml | 78 ++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 52 deletions(-) create mode 100644 .github/workflows/release-prep.yml diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml index 2a799eb59..9294e845f 100644 --- a/.github/workflows/build-prod.yml +++ b/.github/workflows/build-prod.yml @@ -1,64 +1,13 @@ +# Builds the production version of the app name: build-prod on: - pull_request: - types: [labeled, opened, synchronize, reopened] push: branches: - master - "*.*.z" jobs: - version-check: - if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} - runs-on: ubuntu-latest - steps: - - name: Checkout the branch this PR wants to update - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - with: - ref: ${{ GITHUB_BASE_REF }} - - name: Install jq to parse json - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: jq - - name: Save old package.json version - run: echo "oldPackVersion=$(jq -r ".version" package.json)" >> $GITHUB_ENV - - name: Find and save old major_version from manifest - run: awk 'BEGIN { FS="=" } /^major_version/ { print "oldMajor="$2; }' manifest >> $GITHUB_ENV - - name: Find and save old minor_version from manifest - run: awk 'BEGIN { FS="=" } /^minor_version/ { print "oldMinor="$2; }' manifest >> $GITHUB_ENV - - name: Find and save old build_version from manifest - run: awk 'BEGIN { FS="=" } /^build_version/ { print "oldBuild="$2; }' manifest >> $GITHUB_ENV - - name: Save old manifest version - run: echo "oldManVersion=${{ env.oldMajor }}.${{ env.oldMinor }}.${{ env.oldBuild }}" >> $GITHUB_ENV - - name: Save old Makefile version - run: awk 'BEGIN { FS=" := " } /^VERSION/ { print "oldMakeVersion="$2; }' Makefile >> $GITHUB_ENV - - name: Checkout PR branch - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - - name: Save new package.json version - run: echo "newPackVersion=$(jq -r ".version" package.json)" >> $GITHUB_ENV - - name: package.json version must be updated - if: env.oldPackVersion == env.newPackVersion - run: exit 1 - - name: Find and save new major_version from manifest - run: awk 'BEGIN { FS="=" } /^major_version/ { print "newMajor="$2; }' manifest >> $GITHUB_ENV - - name: Find and save new minor_version from manifest - run: awk 'BEGIN { FS="=" } /^minor_version/ { print "newMinor="$2; }' manifest >> $GITHUB_ENV - - name: Find and save new build_version from manifest - run: awk 'BEGIN { FS="=" } /^build_version/ { print "newBuild="$2; }' manifest >> $GITHUB_ENV - - name: Save new manifest version - run: echo "newManVersion=${{ env.newMajor }}.${{ env.newMinor }}.${{ env.newBuild }}" >> $GITHUB_ENV - - name: Manifest version must be updated - if: env.oldManVersion == env.newManVersion - run: exit 1 - - name: Save new Makefile version - run: awk 'BEGIN { FS=" := " } /^VERSION/ { print "newMakeVersion="$2; }' Makefile >> $GITHUB_ENV - - name: Makefile version must be updated - if: env.oldMakeVersion == env.newMakeVersion - run: exit 1 - - name: All new versions must match - if: (env.newManVersion != env.newPackVersion) || (env.newManVersion != env.newMakeVersion) - run: exit 1 prod: if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release-prep') }} runs-on: ubuntu-latest diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml new file mode 100644 index 000000000..1332f21a7 --- /dev/null +++ b/.github/workflows/release-prep.yml @@ -0,0 +1,78 @@ +# All of the jobs in this workflow will only run if the PR that triggered it has a 'release-prep' label +name: release-prep + +on: + pull_request: + types: [labeled, opened, reopened, synchronize] + +jobs: + version-check: + if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} + runs-on: ubuntu-latest + steps: + - name: Checkout the branch this PR wants to update + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + with: + ref: ${{ GITHUB_BASE_REF }} + - name: Install jq to parse json + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: jq + - name: Save old package.json version + run: echo "oldPackVersion=$(jq -r ".version" package.json)" >> $GITHUB_ENV + - name: Find and save old major_version from manifest + run: awk 'BEGIN { FS="=" } /^major_version/ { print "oldMajor="$2; }' manifest >> $GITHUB_ENV + - name: Find and save old minor_version from manifest + run: awk 'BEGIN { FS="=" } /^minor_version/ { print "oldMinor="$2; }' manifest >> $GITHUB_ENV + - name: Find and save old build_version from manifest + run: awk 'BEGIN { FS="=" } /^build_version/ { print "oldBuild="$2; }' manifest >> $GITHUB_ENV + - name: Save old manifest version + run: echo "oldManVersion=${{ env.oldMajor }}.${{ env.oldMinor }}.${{ env.oldBuild }}" >> $GITHUB_ENV + - name: Save old Makefile version + run: awk 'BEGIN { FS=" := " } /^VERSION/ { print "oldMakeVersion="$2; }' Makefile >> $GITHUB_ENV + - name: Checkout PR branch + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - name: Save new package.json version + run: echo "newPackVersion=$(jq -r ".version" package.json)" >> $GITHUB_ENV + - name: package.json version must be updated + if: env.oldPackVersion == env.newPackVersion + run: exit 1 + - name: Find and save new major_version from manifest + run: awk 'BEGIN { FS="=" } /^major_version/ { print "newMajor="$2; }' manifest >> $GITHUB_ENV + - name: Find and save new minor_version from manifest + run: awk 'BEGIN { FS="=" } /^minor_version/ { print "newMinor="$2; }' manifest >> $GITHUB_ENV + - name: Find and save new build_version from manifest + run: awk 'BEGIN { FS="=" } /^build_version/ { print "newBuild="$2; }' manifest >> $GITHUB_ENV + - name: Save new manifest version + run: echo "newManVersion=${{ env.newMajor }}.${{ env.newMinor }}.${{ env.newBuild }}" >> $GITHUB_ENV + - name: Manifest version must be updated + if: env.oldManVersion == env.newManVersion + run: exit 1 + - name: Save new Makefile version + run: awk 'BEGIN { FS=" := " } /^VERSION/ { print "newMakeVersion="$2; }' Makefile >> $GITHUB_ENV + - name: Makefile version must be updated + if: env.oldMakeVersion == env.newMakeVersion + run: exit 1 + - name: All new versions must match + if: (env.newManVersion != env.newPackVersion) || (env.newManVersion != env.newMakeVersion) + run: exit 1 + build-prod: + if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4 + with: + node-version: "lts/*" + cache: "npm" + - name: NPM install + run: npm ci + - name: Install roku module dependencies + run: npm run ropm + - name: Build app for production + run: npm run build-prod + - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3 + with: + name: Jellyfin-Roku-v${{ env.newManVersion }}-${{ github.sha }} + path: ${{ github.workspace }}/build/staging + if-no-files-found: error From 015d634222df6cdb9db348fa33837d78580b5d81 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 10:45:44 -0500 Subject: [PATCH 10/20] save branch to env variable --- .github/workflows/release-prep.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index 1332f21a7..ea63ff5f0 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -10,10 +10,12 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} runs-on: ubuntu-latest steps: + - name: Save branch name + run: echo "branch=${GITHUB_BASE_REF}" >> $GITHUB_ENV - name: Checkout the branch this PR wants to update uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: - ref: ${{ GITHUB_BASE_REF }} + ref: env.branch - name: Install jq to parse json uses: awalsh128/cache-apt-pkgs-action@latest with: From 40d54f2280e6183d9a26285e57dfb5276b02c817 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 10:48:26 -0500 Subject: [PATCH 11/20] fix formatting --- .github/workflows/release-prep.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index ea63ff5f0..7b10a1892 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -58,7 +58,7 @@ jobs: - name: All new versions must match if: (env.newManVersion != env.newPackVersion) || (env.newManVersion != env.newMakeVersion) run: exit 1 - build-prod: + build-prod: if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} runs-on: ubuntu-latest steps: From 75d574b64ea477ee79f51ee844992278397d0c5d Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 10:52:18 -0500 Subject: [PATCH 12/20] fix var syntax --- .github/workflows/release-prep.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index 7b10a1892..4bde906f2 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -10,12 +10,10 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} runs-on: ubuntu-latest steps: - - name: Save branch name - run: echo "branch=${GITHUB_BASE_REF}" >> $GITHUB_ENV - name: Checkout the branch this PR wants to update uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: - ref: env.branch + ref: ${{ GITHUB_BASE_REF }} - name: Install jq to parse json uses: awalsh128/cache-apt-pkgs-action@latest with: From f2582a9fcfb355e512b37f3cdd2a23ddf36890d2 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 10:55:07 -0500 Subject: [PATCH 13/20] bugfix --- .github/workflows/release-prep.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index 4bde906f2..21a5bb6ed 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout the branch this PR wants to update uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: - ref: ${{ GITHUB_BASE_REF }} + ref: ${{ github.GITHUB_BASE_REF }} - name: Install jq to parse json uses: awalsh128/cache-apt-pkgs-action@latest with: From 72f416622980fb8296cea6b82db6d9b0c4b756e9 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 10:57:48 -0500 Subject: [PATCH 14/20] bump package.json version test --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fc011f065..a8e26e2a8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jellyfin-roku", "type": "module", - "version": "2.0.0", + "version": "2.0.1", "description": "Roku app for Jellyfin media server", "dependencies": { "@rokucommunity/bslib": "0.1.1", @@ -55,4 +55,4 @@ "url": "https://github.com/jellyfin/jellyfin-roku/issues" }, "homepage": "https://github.com/jellyfin/jellyfin-roku" -} \ No newline at end of file +} From 9ab0664278e319346dde5bf606f7947c33b033c4 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 11:05:40 -0500 Subject: [PATCH 15/20] add debugging info --- .github/workflows/release-prep.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index 21a5bb6ed..e48422f05 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -10,6 +10,14 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} runs-on: ubuntu-latest steps: + - name: DEBUG github.GITHUB_BASE_REF + run: echo ${{ github.GITHUB_BASE_REF }} + - name: DEBUG github.event.pull_request.head.sha + run: echo ${{ github.event.pull_request.head.sha }} + - name: DEBUG github.sha + run: echo ${{ github.sha }} + - name: DEBUG github.event.pull_request.base.sha + run: echo ${{ github.event.pull_request.base.sha }} - name: Checkout the branch this PR wants to update uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: From a282957d4cad977f2aefd07b1511799383380d6d Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 11:07:47 -0500 Subject: [PATCH 16/20] testing --- .github/workflows/release-prep.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index e48422f05..b67e1f5ed 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -10,18 +10,12 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} runs-on: ubuntu-latest steps: - - name: DEBUG github.GITHUB_BASE_REF - run: echo ${{ github.GITHUB_BASE_REF }} - - name: DEBUG github.event.pull_request.head.sha - run: echo ${{ github.event.pull_request.head.sha }} - - name: DEBUG github.sha - run: echo ${{ github.sha }} - - name: DEBUG github.event.pull_request.base.sha - run: echo ${{ github.event.pull_request.base.sha }} + - name: DEBUG env.GITHUB_BASE_REF + run: echo ${{ env.GITHUB_BASE_REF }} - name: Checkout the branch this PR wants to update uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: - ref: ${{ github.GITHUB_BASE_REF }} + ref: ${{ env.GITHUB_BASE_REF }} - name: Install jq to parse json uses: awalsh128/cache-apt-pkgs-action@latest with: From 909528aebaa982d60fffe6741e3842d260eee7dc Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 11:12:11 -0500 Subject: [PATCH 17/20] fix version-check job --- .github/workflows/release-prep.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index b67e1f5ed..a7958ad95 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -10,12 +10,12 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'release-prep') }} runs-on: ubuntu-latest steps: - - name: DEBUG env.GITHUB_BASE_REF - run: echo ${{ env.GITHUB_BASE_REF }} + - name: DEBUG ${{ github.event.pull_request.base.ref }} + run: echo ${{ ${{ github.event.pull_request.base.ref }} }} - name: Checkout the branch this PR wants to update uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: - ref: ${{ env.GITHUB_BASE_REF }} + ref: ${{ ${{ github.event.pull_request.base.ref }} }} - name: Install jq to parse json uses: awalsh128/cache-apt-pkgs-action@latest with: From 53a17c3c789d6113ece99b2b695c57aed6f02daa Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 11:13:42 -0500 Subject: [PATCH 18/20] fix syntax --- .github/workflows/release-prep.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index a7958ad95..56053b96b 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -11,11 +11,11 @@ jobs: runs-on: ubuntu-latest steps: - name: DEBUG ${{ github.event.pull_request.base.ref }} - run: echo ${{ ${{ github.event.pull_request.base.ref }} }} + run: echo ${{ ${{ github.event.pull_request.base.ref }} - name: Checkout the branch this PR wants to update uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: - ref: ${{ ${{ github.event.pull_request.base.ref }} }} + ref: ${{ ${{ github.event.pull_request.base.ref }} - name: Install jq to parse json uses: awalsh128/cache-apt-pkgs-action@latest with: From e33f823d95f445d335e344dfaa5aac36858e5565 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 11:14:01 -0500 Subject: [PATCH 19/20] fix syntax --- .github/workflows/release-prep.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index 56053b96b..d8a1c51ec 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -11,11 +11,11 @@ jobs: runs-on: ubuntu-latest steps: - name: DEBUG ${{ github.event.pull_request.base.ref }} - run: echo ${{ ${{ github.event.pull_request.base.ref }} + run: echo ${{ github.event.pull_request.base.ref }} - name: Checkout the branch this PR wants to update uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: - ref: ${{ ${{ github.event.pull_request.base.ref }} + ref: ${{ github.event.pull_request.base.ref }} - name: Install jq to parse json uses: awalsh128/cache-apt-pkgs-action@latest with: From 328e5640644add0aa01086f424711ddf0d5876d1 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Fri, 15 Dec 2023 11:24:56 -0500 Subject: [PATCH 20/20] Revert "bump package.json version test" This reverts commit 72f416622980fb8296cea6b82db6d9b0c4b756e9. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a8e26e2a8..fc011f065 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jellyfin-roku", "type": "module", - "version": "2.0.1", + "version": "2.0.0", "description": "Roku app for Jellyfin media server", "dependencies": { "@rokucommunity/bslib": "0.1.1", @@ -55,4 +55,4 @@ "url": "https://github.com/jellyfin/jellyfin-roku/issues" }, "homepage": "https://github.com/jellyfin/jellyfin-roku" -} +} \ No newline at end of file