Fix invocation of buildall.elv in GitHub Actions and Cirrus CI scripts.

The first argument should point to a Go package.

Also change the pattern for sha256sum files to include all files ending in
.sha256sum, now that the archives have also been made reproducible.
This commit is contained in:
Qi Xiao 2024-02-22 16:25:46 +00:00
parent c03e34dffa
commit 9509111fa9
2 changed files with 6 additions and 6 deletions

View File

@ -77,11 +77,11 @@ build_binaries_task:
# _bin is in .gitignore, so Git won't consider the repo dirty. This will
# impact the binary, which encodes VCS information.
build_binaries_script: |
go run ./cmd/elvish ./tools/buildall.elv -name elvish-HEAD -variant official . _bin/
go run ./cmd/elvish ./tools/buildall.elv -name elvish-HEAD -variant official ./cmd/elvish _bin/
binaries_artifacts:
path: _bin/**
binary_checksums_artifacts:
path: _bin/*/elvish-HEAD.sha256sum _bin/*/elvish-HEAD.exe.sha256sum
path: _bin/*/*.sha256sum
check_binary_checksums_task:
name: Check binary checksums ($HOST)
@ -121,7 +121,7 @@ check_binary_checksums_task:
cd _bin
ret=0
for f in */elvish-HEAD.sha256sum */elvish-HEAD.exe.sha256sum; do
for f in */*.sha256sum
website_sum=$(curl -sS https://$HOST.dl.elv.sh/$f | awk '{print $1}')
ci_sum=$(cat $f | awk '{print $1}')
if test "$website_sum" = "$ci_sum"; then

View File

@ -49,7 +49,7 @@ jobs:
# https://github.com/elves/up/blob/master/Dockerfile
go-version: 1.22.0
- name: Build binaries
run: go run ./cmd/elvish ./tools/buildall.elv -name elvish-HEAD -variant official . ~/elvish-bin/
run: go run ./cmd/elvish ./tools/buildall.elv -name elvish-HEAD -variant official ./cmd/elvish ~/elvish-bin/
- name: Upload binaries
uses: actions/upload-artifact@v4
with:
@ -60,7 +60,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: bin-checksums
path: ~/elvish-bin/**/elvish-HEAD.sha256sum
path: ~/elvish-bin/*/*.sha256sum
check_binary_checksums:
name: Check binary checksums
@ -79,7 +79,7 @@ jobs:
working-directory: elvish-bin
run: |
ret=0
for f in */elvish-HEAD.sha256sum */elvish-HEAD.exe.sha256sum; do
for f in */*.sha256sum; do
website_sum=$(curl -sS https://${{ matrix.host }}.dl.elv.sh/$f | awk '{print $1}')
github_sum=$(cat $f | awk '{print $1}')
if test "$website_sum" = "$github_sum"; then