Skip to content

Commit 50af33b

Browse files
committed
github-actionify: improve var names and filenames
There is no reason for the YAML files to begin with a dot character. These are not hidden files; they are just build configuration files. The workflows in question are the main build, and the PR build, so we now name them as such. While a project's CI may have other workflows besides these, in the standard case, these two workflows are the two used by the vast majority of SciJava projects. Projects needing customization beyond this are of course free to rename everything however they see fit, hack the build scripts, or do whatever.
1 parent 753a0d4 commit 50af33b

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

github-actionify.sh

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
dir="$(dirname "$0")"
1515

1616
ciDir=.github
17-
ciConfigRoot=/workflows/.gitaction.yml
18-
ciConfig=$ciDir$ciConfigRoot
19-
ciPRConfig=$ciDir/workflows/.gitaction-pr.yml
17+
ciSlugBuildMain=workflows/build-main.yml
18+
ciSlugBuildPR=workflows/build-pr.yml
19+
ciConfigBuildMain=$ciDir/$ciSlugBuildMain
20+
ciConfigBuildPR=$ciDir/$ciSlugBuildPR
2021
ciSetupScript=$ciDir/setup.sh
2122
ciBuildScript=$ciDir/build.sh
2223
ciSettingsFile=$ciDir/settings.xml
@@ -117,9 +118,9 @@ process() {
117118
# -- GitHub Action sanity checks --
118119

119120
test -e "$ciDir" -a ! -d "$ciDir" && die "$ciDir is not a directory"
120-
test -e "$ciConfig" -a ! -f "$ciConfig" && die "$ciConfig is not a regular file"
121-
test -e "$ciPRConfig" -a ! -f "$ciPRConfig" && die "$ciPRConfig is not a regular file"
122-
test -e "$ciConfig" && warn "$ciConfig already exists"
121+
test -e "$ciConfigBuildMain" -a ! -f "$ciConfigBuildMain" && die "$ciConfigBuildMain is not a regular file"
122+
test -e "$ciConfigBuildPR" -a ! -f "$ciConfigBuildPR" && die "$ciConfigBuildPR is not a regular file"
123+
test -e "$ciConfigBuildMain" && warn "$ciConfigBuildMain already exists"
123124
test -e "$ciBuildScript" && warn "$ciBuildScript already exists"
124125
test -e "$ciSetupScript" && warn "$ciSetupScript already exists"
125126

@@ -170,7 +171,7 @@ jobs:
170171
OSSRH_PASS: \${{ secrets.OSSRH_PASS }}
171172
SIGNING_ASC: \${{ secrets.SIGNING_ASC }}
172173
EOL
173-
update "$ciConfig" "add/update main build action"
174+
update "$ciConfigBuildMain" "add/update main build action"
174175

175176
# Add/update the GitHub Actions PR configuration file.
176177
cat >"$tmpFile" <<EOL
@@ -210,7 +211,7 @@ jobs:
210211
- name: Build with Maven
211212
run: ./$ciBuildScript
212213
EOL
213-
update "$ciPRConfig" "add/update PR build action"
214+
update "$ciConfigBuildPR" "add/update PR build action"
214215

215216
# Add/update the GitHub Action setup script.
216217
cat >"$tmpFile" <<EOL
@@ -276,11 +277,11 @@ EOL
276277
if grep -q "travis-ci.*svg" README.md >/dev/null 2>&1
277278
then
278279
info "Updating README.md GitHub Action badge"
279-
sed "s;travis-ci.*;$domain/$repoSlug/actions/$ciConfigRoot/badge.svg)](https://$domain/$repoSlug/actions$ciConfigRoot);g" README.md >"$tmpFile"
280+
sed "s;travis-ci.*;$domain/$repoSlug/actions/$ciSlugBuildMain/badge.svg)](https://$domain/$repoSlug/actions/$ciSlugBuildMain);g" README.md >"$tmpFile"
280281
update README.md 'update README.md badge link'
281282
else
282283
info "Adding GitHub Action badge to README.md"
283-
echo "[![SciJava CI](https://$domain/$repoSlug/actions/$ciConfigRoot/badge.svg)](https://$domain/$repoSlug/actions/$ciConfigRoot)" >"$tmpFile"
284+
echo "[![](https://$domain/$repoSlug/actions/$ciSlugBuildMain/badge.svg)](https://$domain/$repoSlug/actions/$ciSlugBuildMain)" >"$tmpFile"
284285
echo >>"$tmpFile"
285286
test -f README.md && cat README.md >>"$tmpFile"
286287
update README.md 'add README.md badge link'

0 commit comments

Comments
 (0)