Skip to content

Commit ea59c65

Browse files
authored
Update workflows from templates. (#73)
1 parent 88ee589 commit ea59c65

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/bump-version.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,10 @@ for FILE in ${VERSFILES} ; do
166166

167167
version.sbt)
168168
# Replace -foo with -SNAPSHOT to be compatible with Java conventions.
169-
JAVAVERS="${NEWVERS/-*/-SNAPSHOT}"
169+
# Disabling this logic to work with cmk-s3-proxy. Since we only use bump-version to publish our scala containers, not our
170+
# scala libs, the -SNAPSHOT suffix isn't an important convention.
171+
# JAVAVERS="${NEWVERS/-*/-SNAPSHOT}"
172+
JAVAVERS="${NEWVERS}"
170173

171174
# The file might use the old, deprecated syntax or the newer syntax:
172175
# version in ThisBuild := "1.2.3-SNAPSHOT"

.github/workflows/update-workflows.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ jobs:
5252
5353
chmod +x ~/bin/json2yaml ~/bin/yaml2json
5454
55+
echo "${HOME}/bin" >> ${GITHUB_PATH}
56+
5557
'
5658
- name: Check out this repo
5759
uses: actions/checkout@v2
@@ -69,10 +71,10 @@ jobs:
6971
working-directory: thisrepo
7072
run: "set -x\nset -o pipefail\n\n# If it fails, we still want to create a PR;\
7173
\ it helps signal a human to come fix it.\nif ! bash -x .github/update-workflows.sh\
72-
\ ; then\n echo \"::set-output name=failed::true\"\nelse\n echo \"::set-output\
73-
\ name=failed::false\"\nfi\n\necho \"Git status:\"\ngit status\n\ngit add\
74-
\ -A\n\nif [ -z \"$(git status --porcelain)\" ] ; then\n echo \"No updated\
75-
\ workflows; done.\"\n echo \"::set-output name=skip::true\"\nfi\n"
74+
\ ; then\n echo \"::set-output name=failed::true\"\n exit\nelse\n echo\
75+
\ \"::set-output name=failed::false\"\nfi\n\necho \"Git status:\"\ngit status\n\
76+
\ngit add -A\n\nif [ -z \"$(git status --porcelain)\" ] ; then\n echo \"\
77+
No updated workflows; done.\"\n echo \"::set-output name=skip::true\"\nfi\n"
7678
- name: Commit and PR
7779
working-directory: thisrepo
7880
if: steps.update.outputs.skip != 'true'

0 commit comments

Comments
 (0)