diff --git a/.github/workflows/moq-ci.yml b/.github/workflows/moq-ci.yml index ca185fcbf0..16ad72be42 100644 --- a/.github/workflows/moq-ci.yml +++ b/.github/workflows/moq-ci.yml @@ -1,6 +1,6 @@ -# The fork's own CI. Upstream's workflows stay in the tree so a sync never -# conflicts on them, but they are disabled in the repository settings because -# they need n0's self-hosted runners and secrets. +# The fork's own CI. Upstream's workflows stay in the tree but are disabled in +# the repository settings because they need n0's self-hosted runners and +# secrets. name: moq-ci on: diff --git a/.github/workflows/moq-sync.yml b/.github/workflows/moq-sync.yml deleted file mode 100644 index e3aa57c76d..0000000000 --- a/.github/workflows/moq-sync.yml +++ /dev/null @@ -1,49 +0,0 @@ -# Merges n0-computer/noq main into the fork weekly and opens a pull request -# with the result, so drift is visible before it is expensive. A merge that -# conflicts fails the job; resolve it by hand with the same commands. -name: moq-sync - -on: - schedule: - - cron: "0 6 * * 1" - workflow_dispatch: - -permissions: - contents: write - pull-requests: write - -jobs: - sync: - runs-on: ubuntu-latest - timeout-minutes: 15 - steps: - - uses: actions/checkout@v6 - with: - fetch-depth: 0 - - name: Merge upstream main - id: merge - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - git remote add upstream https://github.com/n0-computer/noq.git - git fetch upstream main - parent=$(git rev-parse upstream/main) - if test "$(cat PARENT)" = "$parent"; then - echo "up to date with $parent" - echo "changed=false" >> "$GITHUB_OUTPUT" - exit 0 - fi - git merge --no-edit upstream/main - echo "$parent" > PARENT - git commit -am "chore: record parent $parent" - echo "changed=true" >> "$GITHUB_OUTPUT" - echo "parent=$parent" >> "$GITHUB_OUTPUT" - - uses: peter-evans/create-pull-request@v7 - if: steps.merge.outputs.changed == 'true' - with: - branch: sync/upstream - title: "chore: sync with n0-computer/noq" - body: | - Merges n0-computer/noq main at ${{ steps.merge.outputs.parent }}. - - Compare the carried set with `git log --no-merges upstream/main..main`. diff --git a/README.md b/README.md index 18e69d9a50..bd9fea3e88 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,20 @@ # noq (moq-dev fork) +**Frozen.** This fork takes only security patches for +[Media over QUIC](https://github.com/moq-dev/moq)'s `release` line, and will be +archived once no released MoQ crate depends on it. Its successor is +[`rs/moq-quic`](https://github.com/moq-dev/moq/tree/main/rs/moq-quic) in +moq-dev/moq, a hard fork of quinn. + This is [moq-dev](https://github.com/moq-dev)'s fork of [n0-computer/noq](https://github.com/n0-computer/noq), published on crates.io as `moq-noq`, `moq-noq-proto`, `moq-noq-udp`, and `web-transport-moq`, the -WebTransport adapter over the fork. All four share one version and one release. -It carries the QUIC features [Media over QUIC](https://github.com/moq-dev/moq) -needs before they land upstream, and it never publishes under the parent's -names. `PARENT` names the -upstream commit each release includes, and `moq-sync` merges upstream weekly. -General changes are offered upstream once their shape settles; the carried set -is `git log --no-merges upstream/main..main`. [CHANGELOG-MOQ.md](CHANGELOG-MOQ.md) lists each -release's parent and carried changes. +WebTransport adapter over the fork. All four share one version and one release, +and never publish under the parent's names. It no longer merges upstream. +`PARENT` names the upstream commit each release includes, and the carried set +is `git log --no-merges upstream/main..main`. +[CHANGELOG-MOQ.md](CHANGELOG-MOQ.md) lists each release's parent and carried +changes. The upstream README follows.