diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index c57bb3b..f15569c 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -11,15 +11,19 @@ on: default: development required: true push: + branches: [main] tags: ['v*'] concurrency: - group: desktop-${{ github.event.pull_request.number || github.ref }} + group: desktop-${{ github.event.pull_request.number || github.sha }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} permissions: contents: read +env: + BUILD_VERSION: ${{ (startsWith(github.ref, 'refs/tags/v') && github.ref_name) || inputs.version || (github.event_name == 'pull_request' && format('pr-{0}', github.event.number)) || (github.ref == 'refs/heads/main' && format('v0.1.0-preview.main.{0}', github.run_number)) || github.ref_name }} + jobs: player: strategy: @@ -35,7 +39,6 @@ jobs: runs-on: ${{ matrix.os }} env: TARGET: ${{ matrix.target }} - BUILD_VERSION: ${{ inputs.version || (github.event_name == 'pull_request' && format('pr-{0}', github.event.number)) || github.ref_name }} steps: - uses: actions/checkout@v5 with: @@ -74,7 +77,7 @@ jobs: if-no-files-found: error retention-days: 14 release: - if: startsWith(github.ref, 'refs/tags/v') + if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || startsWith(github.ref, 'refs/tags/v') needs: player runs-on: ubuntu-22.04 permissions: @@ -94,6 +97,11 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - RELEASE_TAG: ${{ github.ref_name }} run: | - gh release create "$RELEASE_TAG" release-dist/*.zip release-dist/*.zip.sha256 --verify-tag --prerelease --title "Project Vagrant $RELEASE_TAG — unofficial runtime preview" --notes-file distribution/RELEASE-NOTES.txt + release_args=(--prerelease --title "Project Vagrant $BUILD_VERSION — unofficial runtime preview" --notes-file distribution/RELEASE-NOTES.txt) + if [[ "$GITHUB_REF" == refs/tags/v* ]]; then + release_args+=(--verify-tag) + else + release_args+=(--target "$GITHUB_SHA") + fi + gh release create "$BUILD_VERSION" release-dist/*.zip release-dist/*.zip.sha256 "${release_args[@]}" diff --git a/distribution/RELEASE-NOTES.txt b/distribution/RELEASE-NOTES.txt index 6d46063..033b911 100644 --- a/distribution/RELEASE-NOTES.txt +++ b/distribution/RELEASE-NOTES.txt @@ -15,8 +15,11 @@ verifies its files locally. No retail game assets, disc images, BIOS, original-g dialogue, manual or installed-disc cache are supplied in these packages. FFmpeg and ffprobe are bundled; no separate installation or PATH configuration is needed. -This update restores the intro's separately attached sword prop by removing its -extra standalone resting pose while mounted to another actor. The weapon projection, +This preview vendors the audited Linux, Windows and macOS engine SDKs from the +public wol-engine-release repository, including the dialogue sizing repair. +Loose engine shader implementation files and owned debug symbols are excluded. +The opening fixes cover attached sword poses, guard death completion, Ashley's +walk-to-door animation, door overlap and enhanced dragon-head shading. The audio-stall, shared hit-resource and STR/XA installation repairs are retained. The matching FFmpeg/Xiph source and build instructions are in the adjacent ProjectVagrant-media-sources.zip download. diff --git a/docs/DISTRIBUTION.md b/docs/DISTRIBUTION.md index af3b3f6..b6b35d9 100644 --- a/docs/DISTRIBUTION.md +++ b/docs/DISTRIBUTION.md @@ -81,10 +81,14 @@ selected binary engine dependencies. Output defaults to `dist/`; warnings are errors; solution Release maps to ExportRelease. `.github/workflows/desktop.yml` builds and tests on native hosted Linux, Windows -and macOS runners for PRs into main, manual runs and `v*` tags. Checkout is an -ordinary non-recursive clone using its repository token. PR and manual runs upload game archives/checksums as CI artifacts. A `v*` tag -publishes a versioned preview under GitHub Releases only after all three native -jobs pass and the downloaded archive checksums are verified. Releases inherit +and macOS runners for PRs into main, pushes to main, manual runs and `v*` tags. +Checkout is an ordinary non-recursive clone using its repository token. PR and +manual runs upload game archives/checksums as CI artifacts. Every merge to main +also publishes a preview named `v0.1.0-preview.main.`, with +its release tag pointing to the exact merged commit. These automatic previews +use a separate name from manually versioned `v*` releases, which remain supported. +Publication requires all three native jobs and downloaded checksum checks to +pass. A failed platform prevents publication. PR checks do not publish releases. Releases inherit the repository visibility; this workflow does not make a private repository public. Automatic reviews remain enabled.