diff --git a/.github/build.sh b/.github/build.sh index 44a7909d1..7da42622b 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -1,4 +1,3 @@ #!/bin/sh curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh -# NB: Only the Linux CI node should deploy build artifacts. -NO_DEPLOY=$(test "$(uname)" = Linux || echo 1) sh ci-build.sh +sh ci-build.sh diff --git a/.github/setup.sh b/.github/setup.sh index f359bbeeb..d06d5a746 100755 --- a/.github/setup.sh +++ b/.github/setup.sh @@ -1,3 +1,10 @@ #!/bin/sh curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh sh ci-setup-github-actions.sh + +# Let the Linux build handle artifact deployment. +if [ "$(uname)" != Linux ] +then + echo "No deploy -- non-Linux build" + echo "NO_DEPLOY=1" >> $GITHUB_ENV +fi diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b11b4f1a2..64b606407 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,14 +1,14 @@ name: build on: - pull_request: - branches: - - master push: branches: - master tags: - "*-[0-9]+.*" + pull_request: + branches: + - master jobs: build: @@ -28,6 +28,7 @@ jobs: cache: 'maven' - name: Set up CI environment run: .github/setup.sh + shell: bash - name: Execute the build run: .github/build.sh shell: bash