Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/justfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
set fallback
set working-directory := '..'

# actionlint is skipped when absent locally; the root `_tools` preflight makes
# it a hard requirement under MOQ_STRICT, so CI can't skip it.

# Lint GitHub Actions workflows.
# Lint GitHub Actions workflows and their alert coverage.
check:
python3 {{ source_directory() }}/scripts/install-formula.test.py
{{ source_directory() }}/scripts/release.test.sh
@if command -v nfpm >/dev/null 2>&1 && command -v envsubst >/dev/null 2>&1 && command -v dpkg-deb >/dev/null 2>&1 && command -v rpm >/dev/null 2>&1; then python3 {{ source_directory() }}/../rs/scripts/package-rename.test.py; fi
@if command -v actionlint >/dev/null 2>&1; then actionlint; fi
{{ source_directory() }}/scripts/alert.sh check-coverage
@if command -v rustc >/dev/null 2>&1; then {{ source_directory() }}/scripts/package-binary.test.sh; fi
actionlint
sh/gh/alert.sh check-coverage

# Tests of the release tooling itself; nightly, not on every pull request.
test:
python3 sh/gh/install-formula.test.py
sh/gh/release.test.sh
python3 sh/rs/package-rename.test.py
sh/go/publish-wrapper.test.sh
44 changes: 0 additions & 44 deletions .github/scripts/package-binary.test.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/alert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ jobs:
RUN_REF: ${{ github.event.workflow_run.head_branch }}
RUN_TITLE: ${{ github.event.workflow_run.display_title }}
RUN_ACTOR: ${{ github.event.workflow_run.triggering_actor.login }}
run: .github/scripts/alert.sh discord
run: sh/gh/alert.sh discord
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
exit 1
fi
echo "target=${target}" >> "$GITHUB_OUTPUT"
.github/scripts/release.sh parse-version "$target"
sh/gh/release.sh parse-version "$target"

build:
name: Build ${{ matrix.platform }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/interop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
- "test/justfile"
- "package.json"
# The Go client builds against the modules this script stages.
- "go/scripts/**"
- "sh/go/**"
- ".github/workflows/interop.yml"

concurrency:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/libmoq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Parse version
id: parse
shell: bash
run: .github/scripts/release.sh parse-version libmoq
run: sh/gh/release.sh parse-version libmoq

- name: Build and package
shell: bash
Expand Down Expand Up @@ -87,11 +87,11 @@ jobs:

- name: Parse version
id: parse
run: .github/scripts/release.sh parse-version libmoq
run: sh/gh/release.sh parse-version libmoq

- name: Find previous tag
id: prev_tag
run: .github/scripts/release.sh prev-tag libmoq
run: sh/gh/release.sh prev-tag libmoq

- name: Download artifacts
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
Expand All @@ -105,7 +105,7 @@ jobs:
RELEASE_TAG: ${{ github.ref_name }}
RELEASE_TITLE: "libmoq v${{ steps.parse.outputs.version }}"
RELEASE_PREV_TAG: ${{ steps.prev_tag.outputs.tag }}
run: .github/scripts/release.sh create artifacts
run: sh/gh/release.sh create artifacts

# The OBS plugin (cpp/obs) statically links libmoq, so it ships with every
# libmoq release: rebuild it against the release we just published (no
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
- name: Parse version
id: parse
shell: bash
run: .github/scripts/release.sh parse-version libmoq
run: sh/gh/release.sh parse-version libmoq

# Native Xcode / Visual Studio; libobs/Qt6/ffmpeg come from the obs-deps
# bundle and libmoq from the release we just published (--libmoq-release).
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:

- name: Parse version
id: parse
run: .github/scripts/release.sh parse-version libmoq
run: sh/gh/release.sh parse-version libmoq

# Only the obs-moq archives: the libmoq-* artifacts from the build job
# belong to the libmoq release, not this one.
Expand Down Expand Up @@ -208,4 +208,4 @@ jobs:
RELEASE_TAG: "obs-moq-v${{ steps.parse.outputs.version }}"
RELEASE_TITLE: "obs-moq v${{ steps.parse.outputs.version }}"
RELEASE_PREV_TAG: ${{ steps.prev_tag.outputs.tag }}
run: .github/scripts/release.sh create artifacts
run: sh/gh/release.sh create artifacts
26 changes: 13 additions & 13 deletions .github/workflows/moq-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Parse version
id: parse
shell: bash
run: .github/scripts/release.sh parse-version moq-cli
run: sh/gh/release.sh parse-version moq-cli

- name: Set up packaging tools
uses: ./.github/actions/setup-packaging
Expand All @@ -64,7 +64,7 @@ jobs:
VERSION: ${{ steps.parse.outputs.version }}
TARGET: ${{ matrix.target }}
run: |
./rs/scripts/package-binary.sh \
./sh/rs/package-binary.sh \
--crate moq-cli \
--bin moq \
--binary "target/${TARGET}/release/moq" \
Expand All @@ -80,16 +80,16 @@ jobs:
ARCH: ${{ matrix.deb-arch }}
BINARY_PATH: target/${{ matrix.target }}/release/moq
run: |
rs/scripts/package-nfpm.sh packaging/moq-cli/nfpm.yaml deb dist/
rs/scripts/package-nfpm.sh packaging/moq-cli/transition.yaml deb dist/
sh/rs/package-nfpm.sh packaging/moq-cli/nfpm.yaml deb dist/
sh/rs/package-nfpm.sh packaging/moq-cli/transition.yaml deb dist/

- name: Package .rpm
shell: bash
env:
VERSION: ${{ steps.parse.outputs.version }}
ARCH: ${{ matrix.rpm-arch }}
BINARY_PATH: target/${{ matrix.target }}/release/moq
run: rs/scripts/package-nfpm.sh packaging/moq-cli/nfpm.yaml rpm dist/
run: sh/rs/package-nfpm.sh packaging/moq-cli/nfpm.yaml rpm dist/

- name: Upload artifacts
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
Expand Down Expand Up @@ -121,12 +121,12 @@ jobs:
- name: Parse version
id: parse
shell: bash
run: .github/scripts/release.sh parse-version moq-cli
run: sh/gh/release.sh parse-version moq-cli

- name: Build and package tarball
shell: bash
run: |
./rs/scripts/package-binary.sh \
./sh/rs/package-binary.sh \
--crate moq-cli \
--bin moq \
--target ${{ matrix.target }} \
Expand Down Expand Up @@ -169,12 +169,12 @@ jobs:
- name: Parse version
id: parse
shell: bash
run: .github/scripts/release.sh parse-version moq-cli
run: sh/gh/release.sh parse-version moq-cli

- name: Build and package zip
shell: bash
run: |
./rs/scripts/package-windows.sh \
./sh/rs/package-windows.sh \
--crate moq-cli \
--bin moq \
--target ${{ matrix.target }} \
Expand Down Expand Up @@ -204,11 +204,11 @@ jobs:

- name: Parse version
id: parse
run: .github/scripts/release.sh parse-version moq-cli
run: sh/gh/release.sh parse-version moq-cli

- name: Find previous tag
id: prev_tag
run: .github/scripts/release.sh prev-tag moq-cli
run: sh/gh/release.sh prev-tag moq-cli

- name: Download artifacts
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
Expand All @@ -222,10 +222,10 @@ jobs:
RELEASE_TAG: ${{ github.ref_name }}
RELEASE_TITLE: "moq-cli v${{ steps.parse.outputs.version }}"
RELEASE_PREV_TAG: ${{ steps.prev_tag.outputs.tag }}
run: .github/scripts/release.sh create artifacts
run: sh/gh/release.sh create artifacts

- name: Trigger apt/rpm repo publish
env:
GH_TOKEN: ${{ github.token }}
TAG: ${{ github.ref_name }}
run: .github/scripts/trigger-repo-publish.sh
run: sh/gh/trigger-repo-publish.sh
16 changes: 8 additions & 8 deletions .github/workflows/moq-gst.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Parse version
id: parse
shell: bash
run: .github/scripts/release.sh parse-version moq-gst
run: sh/gh/release.sh parse-version moq-gst

- name: Build and package (tarball)
shell: bash
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
- name: Parse version
id: parse
shell: bash
run: .github/scripts/release.sh parse-version moq-gst
run: sh/gh/release.sh parse-version moq-gst

- name: Install GStreamer dev libraries
shell: bash
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
PLUGIN_DIR: /usr/lib/${{ matrix.deb-multiarch }}/gstreamer-1.0
run: |
mkdir -p dist
rs/scripts/package-nfpm.sh packaging/moq-gst/nfpm.yaml deb dist/
sh/rs/package-nfpm.sh packaging/moq-gst/nfpm.yaml deb dist/

- name: Package .rpm
shell: bash
Expand All @@ -172,7 +172,7 @@ jobs:
PLUGIN_DIR: /usr/lib64/gstreamer-1.0
run: |
mkdir -p dist
rs/scripts/package-nfpm.sh packaging/moq-gst/nfpm.yaml rpm dist/
sh/rs/package-nfpm.sh packaging/moq-gst/nfpm.yaml rpm dist/

- name: Upload artifacts
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
Expand All @@ -197,11 +197,11 @@ jobs:

- name: Parse version
id: parse
run: .github/scripts/release.sh parse-version moq-gst
run: sh/gh/release.sh parse-version moq-gst

- name: Find previous tag
id: prev_tag
run: .github/scripts/release.sh prev-tag moq-gst
run: sh/gh/release.sh prev-tag moq-gst

- name: Download artifacts
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
Expand All @@ -215,10 +215,10 @@ jobs:
RELEASE_TAG: ${{ github.ref_name }}
RELEASE_TITLE: "moq-gst v${{ steps.parse.outputs.version }}"
RELEASE_PREV_TAG: ${{ steps.prev_tag.outputs.tag }}
run: .github/scripts/release.sh create artifacts
run: sh/gh/release.sh create artifacts

- name: Trigger apt/rpm repo publish
env:
GH_TOKEN: ${{ github.token }}
TAG: ${{ github.ref_name }}
run: .github/scripts/trigger-repo-publish.sh
run: sh/gh/trigger-repo-publish.sh
Loading
Loading