Skip to content

Commit

Permalink
Merge pull request #2069 from cewert/fix-dependency-workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
cewert authored Nov 28, 2024
2 parents 480db66 + 393ef10 commit c0fb0c2
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 35 deletions.
27 changes: 0 additions & 27 deletions .github/workflows/_build-dev.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/_build-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
prod:
if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release-prep') }}
if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'dependencies')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_roku-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
jobs:
static:
# don't run job on forks and prevent job from running twice when a PR pushes a new commit
if: github.repository == 'jellyfin/jellyfin-roku' && github.event_name != 'pull_request' || github.repository == 'jellyfin/jellyfin-roku' && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
if: github.repository == 'jellyfin/jellyfin-roku' && github.event_name != 'pull_request' || github.repository == 'jellyfin/jellyfin-roku' && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name || contains(github.event.pull_request.labels.*.name, 'dependencies')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/_validate-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ jobs:
uses: ./.github/workflows/_lint-spelling.yml
lint-translation-files:
uses: ./.github/workflows/_lint-translation-files.yml
build-dev:
uses: ./.github/workflows/_build-dev.yml
build-prod:
uses: ./.github/workflows/_build-prod.yml
roku-analysis:
Expand Down
21 changes: 20 additions & 1 deletion .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,23 @@ on:

jobs:
dev:
uses: ./.github/workflows/_build-dev.yml
# prevent job from running twice when a PR pushes a new commit
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # 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
run: npm run build
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
with:
name: Jellyfin-Roku-dev-${{ github.sha }}
path: ${{ github.workspace }}/build/staging
if-no-files-found: error
3 changes: 0 additions & 3 deletions .github/workflows/roku-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ name: roku-analysis
on:
pull_request:

env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}

jobs:
static:
uses: ./.github/workflows/_roku-analysis.yml

0 comments on commit c0fb0c2

Please sign in to comment.