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: 18 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -259,13 +259,23 @@ jobs:
$prevRev = git rev-parse HEAD~1
$currRev = git rev-parse HEAD
.\bazel-diff-example.ps1 -WorkspacePath "$env:GITHUB_WORKSPACE" -BazelPath "$env:USERPROFILE\go\bin\bazelisk.exe" -PreviousRevision $prevRev -FinalRevision $currRev
deploy:
# Verifies per-PR that everything a release ships still builds, on every
# platform it ships for. It publishes nothing: release.yaml owns that, via
# release_prep.sh (JAR + source archive) and its rust-binaries matrix. This
# job predates that flow -- it used to *be* the deploy -- so its uploads are
# a build check whose output happens to be downloadable, nothing more.
release-artifacts:
# Explicit name so the status check is stable. Left implicit, GitHub derives
# it from every matrix value -- which is how branch protection ended up
# requiring `deploy (11)`, a check that stopped existing the moment this job
# grew an os/rust_asset matrix. Adding a matrix key must not rename a check.
name: release-artifacts (${{ matrix.os }})
needs: [test-jre21]
runs-on: ${{ matrix.os }}
permissions:
# Read-only: nothing here attests or publishes. The id-token/attestations
# writes this job used to request were left over from the old deploy.
contents: read
id-token: write
attestations: write
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -332,9 +342,13 @@ jobs:
name: bazel-diff_deploy.jar
path: bazel-bin/cli/bazel-diff_deploy.jar
if-no-files-found: error
# The same script release_prep.sh packs the shipped archive with, so this
# check can't pass on an archive the release would not produce. It used to
# call `make release_source_archive`, a second tar recipe that had already
# drifted (no __pycache__/*.pyc excludes).
- name: Build release source archive
if: matrix.upload_jar_and_archive
run: make release_source_archive
run: .github/workflows/pack_release_archive.sh archives/release.tar.gz
- uses: actions/upload-artifact@v4
if: matrix.upload_jar_and_archive
with:
Expand Down
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Delegates rather than repeating the tar invocation: release_prep.sh (release),
# bcr_consumer.yaml and ci.yaml all pack through this one script, so the archive
# you get locally is byte-for-byte the recipe that ships. The inlined copy that
# used to live here had already drifted from it.
# Note: the script lives under .github/, which the archive itself excludes, so
# this target only works in a git checkout -- not inside an extracted release.
.PHONY: release_source_archive
release_source_archive:
mkdir -p archives
tar --exclude-vcs \
--exclude=bazel-* \
--exclude=target \
--exclude=.github \
--exclude=archives \
-zcf "archives/release.tar.gz" .
.github/workflows/pack_release_archive.sh archives/release.tar.gz

.PHONY: release_deploy_jar
release_deploy_jar:
Expand Down
Loading