Skip to content

Take control over your live stream video by running it yourself. Streaming + chat out of the box.

chore(ci): fix duplicate runs of bundle step

Gabe Kangas7c3fc9f3c440
diff --git a/.github/workflows/bundle-web.yml b/.github/workflows/bundle-web.yml
deleted file mode 100644
index cd062bbb50..0000000000
--- a/.github/workflows/bundle-web.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Build and bundle web app into Owncast
-on:
- push:
- branches:
- - develop
- paths:
- - 'web/**'
- - '!**.md'
-
-jobs:
- bundle:
- runs-on: ubuntu-latest
- if: github.repository == 'owncast/owncast'
-
- steps:
- - id: skip_check
- uses: fkirc/skip-duplicate-actions@v5
- with:
- concurrent_skipping: 'same_content_newer'
-
- - name: Cache node modules
- uses: actions/cache@v3
- env:
- cache-name: cache-node-modules-bundle-web-app
- with:
- path: ~/.npm
- key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('web/package-lock.json') }}
- restore-keys: |
- ${{ runner.os }}-build-${{ env.cache-name }}-
- ${{ runner.os }}-build-
- ${{ runner.os }}-
-
- - name: Bundle web app (next.js build)
- uses: actions/checkout@v3
- - run: build/web/bundleWeb.sh
-
- - name: Commit changes
- uses: EndBug/add-and-commit@v9
- with:
- pull: --rebase --autostash
- message: 'Bundle embedded web app'
- add: 'static/web'
- author_name: Owncast
- author_email: [email protected]
diff --git a/.github/workflows/javascript-format-build.yml b/.github/workflows/javascript-format-build.yml
index 2e874a7bb8..7c0fe43a96 100644
--- a/.github/workflows/javascript-format-build.yml
+++ b/.github/workflows/javascript-format-build.yml
@@ -5,9 +5,12 @@ on:
push:
paths:
- web/**
+ - '!**.md'
+
pull_request:
paths:
- web/**
+ - '!**.md'
jobs:
formatting:
@@ -22,6 +25,8 @@ jobs:
uses: fkirc/skip-duplicate-actions@v5
with:
concurrent_skipping: 'same_content_newer'
+ cancel_others: 'true'
+ skip_after_successful_duplicate: 'true'
- name: Checkout
uses: actions/checkout@v3
@@ -77,6 +82,7 @@ jobs:
author_name: Owncast
author_email: [email protected]
message: 'Javascript formatting autofixes'
+ add: ${{ steps.changed-files.outputs.src_all_changed_files }}
pull: '--rebase --autostash'
unused-code:
@@ -91,6 +97,8 @@ jobs:
uses: fkirc/skip-duplicate-actions@v5
with:
concurrent_skipping: 'same_content_newer'
+ cancel_others: 'true'
+ skip_after_successful_duplicate: 'true'
- name: Checkout
uses: actions/checkout@v3