Skip to content

Commit

Permalink
CI: fix Windows build
Browse files Browse the repository at this point in the history
This patch does three things:

1. Consolidates the build-main and build-pr configs into one.

2. Fixes the Windows build to actually do something, by adding
   the needed `shell: bash` lines into the .yml configuration.

3. Skips the deployment for all platforms except Linux, to
   avoid double deploys / failing releases.
  • Loading branch information
ctrueden committed Jul 24, 2024
1 parent 34bf14f commit 82e65e7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 23 deletions.
7 changes: 7 additions & 0 deletions .github/setup.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#!/bin/sh
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/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
23 changes: 0 additions & 23 deletions .github/workflows/build-pr.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
- master
tags:
- "*-[0-9]+.*"
pull_request:
branches:
- master

jobs:
build:
Expand All @@ -24,8 +27,10 @@ jobs:
cache: 'maven'
- name: Set up CI environment
run: .github/setup.sh
shell: bash
- name: Execute the build
run: .github/build.sh
shell: bash
env:
GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down

0 comments on commit 82e65e7

Please sign in to comment.