Skip to content

Commit fd386c7

Browse files
committed
github-actionify: consolidate to one build.yml
Still needed: change ci-build.sh not to deploy when building PRs. However, as things stand, this will only happen when the PR's branch is from the same repository, rather than from a fork.
1 parent 22675f3 commit fd386c7

File tree

1 file changed

+12
-36
lines changed

1 file changed

+12
-36
lines changed

github-actionify.sh

+12-36
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
dir="$(dirname "$0")"
1010

1111
ciDir=.github
12-
ciSlugBuildMain=workflows/build-main.yml
13-
ciSlugBuildPR=workflows/build-pr.yml
14-
ciConfigBuildMain=$ciDir/$ciSlugBuildMain
15-
ciConfigBuildPR=$ciDir/$ciSlugBuildPR
12+
ciSlugBuild=workflows/build.yml
13+
ciConfigBuild=$ciDir/$ciSlugBuild
1614
ciSetupScript=$ciDir/setup.sh
1715
ciBuildScript=$ciDir/build.sh
1816
pomMinVersion='17.1.1'
@@ -104,9 +102,8 @@ process() {
104102
# -- GitHub Action sanity checks --
105103

106104
test -e "$ciDir" -a ! -d "$ciDir" && die "$ciDir is not a directory"
107-
test -e "$ciConfigBuildMain" -a ! -f "$ciConfigBuildMain" && die "$ciConfigBuildMain is not a regular file"
108-
test -e "$ciConfigBuildPR" -a ! -f "$ciConfigBuildPR" && die "$ciConfigBuildPR is not a regular file"
109-
test -e "$ciConfigBuildMain" && warn "$ciConfigBuildMain already exists"
105+
test -e "$ciConfigBuild" -a ! -f "$ciConfigBuild" && die "$ciConfigBuild is not a regular file"
106+
test -e "$ciConfigBuild" && warn "$ciConfigBuild already exists"
110107
test -e "$ciBuildScript" && warn "$ciBuildScript already exists"
111108
test -e "$ciSetupScript" && warn "$ciSetupScript already exists"
112109

@@ -137,7 +134,7 @@ process() {
137134

138135
# -- Do things --
139136

140-
# Add/update the main GitHub Actions configuration file.
137+
# Add/update the GitHub Actions build configuration file.
141138
cat >"$tmpFile" <<EOL
142139
name: build
143140
@@ -147,28 +144,6 @@ on:
147144
- $defaultBranch
148145
tags:
149146
- "*-[0-9]+.*"
150-
151-
jobs:
152-
build:
153-
runs-on: ubuntu-latest
154-
155-
steps:
156-
- $actionCheckout
157-
- $actionSetupJava
158-
EOL
159-
test -f environment.yml && echo " - $actionSetupConda" >>"$tmpFile"
160-
cat >>"$tmpFile" <<EOL
161-
- $actionSetupCI
162-
- $actionExecuteBuild
163-
$actionSecrets
164-
EOL
165-
update "$ciConfigBuildMain" "add/update main build action"
166-
167-
# Add/update the GitHub Actions PR configuration file.
168-
cat >"$tmpFile" <<EOL
169-
name: build PR
170-
171-
on:
172147
pull_request:
173148
branches:
174149
- $defaultBranch
@@ -185,10 +160,11 @@ EOL
185160
cat >>"$tmpFile" <<EOL
186161
- $actionSetupCI
187162
- $actionExecuteBuild
163+
$actionSecrets
188164
EOL
189-
update "$ciConfigBuildPR" "add/update PR build action"
165+
update "$ciConfigBuild" "add/update build action"
190166

191-
# Add/update the GitHub Action setup script.
167+
# Add/update the GitHub Actions setup script.
192168
cat >"$tmpFile" <<EOL
193169
#!/bin/sh
194170
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh
@@ -197,7 +173,7 @@ EOL
197173
chmod +x "$tmpFile"
198174
update "$ciSetupScript" "add executable script $ciSetupScript" "true"
199175

200-
# Add/update the GitHub Action build script.
176+
# Add/update the GitHub Actions build script.
201177
cat >"$tmpFile" <<EOL
202178
#!/bin/sh
203179
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh
@@ -250,14 +226,14 @@ EOL
250226
if grep -q "travis-ci.*svg" README.md >/dev/null 2>&1
251227
then
252228
info "Updating README.md GitHub Action badge"
253-
sed "s;travis-ci.*;$domain/$repoSlug/actions/$ciSlugBuildMain/badge.svg)](https://$domain/$repoSlug/actions/$ciSlugBuildMain);g" README.md >"$tmpFile"
229+
sed "s;travis-ci.*;$domain/$repoSlug/actions/$ciSlugBuild/badge.svg)](https://$domain/$repoSlug/actions/$ciSlugBuild);g" README.md >"$tmpFile"
254230
update README.md 'update README.md badge link'
255-
elif grep -qF "$domain/$repoSlug/actions/$ciSlugBuildMain/badge.svg" README.md >/dev/null 2>&1
231+
elif grep -qF "$domain/$repoSlug/actions/$ciSlugBuild/badge.svg" README.md >/dev/null 2>&1
256232
then
257233
info "GitHub Action badge already present in README.md"
258234
else
259235
info "Adding GitHub Action badge to README.md"
260-
echo "[![](https://$domain/$repoSlug/actions/$ciSlugBuildMain/badge.svg)](https://$domain/$repoSlug/actions/$ciSlugBuildMain)" >"$tmpFile"
236+
echo "[![Build Status](https://$domain/$repoSlug/actions/$ciSlugBuild/badge.svg)](https://$domain/$repoSlug/actions/$ciSlugBuild)" >"$tmpFile"
261237
echo >>"$tmpFile"
262238
test -f README.md && cat README.md >>"$tmpFile"
263239
update README.md 'add README.md badge link'

0 commit comments

Comments
 (0)