File tree Expand file tree Collapse file tree 2 files changed +10
-5
lines changed Expand file tree Collapse file tree 2 files changed +10
-5
lines changed Original file line number Diff line number Diff 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"
Original file line number Diff line number Diff line change 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\n set -o pipefail\n\n # If it fails, we still want to create a PR;\
7173 \ it helps signal a human to come fix it.\n if ! bash -x .github/update-workflows.sh\
72- \ ; then\n echo \" ::set-output name=failed::true\"\n else\n echo \" ::set-output \
73- \ name=failed::false\"\n fi\n\n echo \" Git status:\"\n git status\n\n git add \
74- \ -A\n\n if [ -z \" $(git status --porcelain)\" ] ; then\n echo \" No updated \
75- \ workflows; done.\"\n echo \" ::set-output name=skip::true\"\n fi\n "
74+ \ ; then\n echo \" ::set-output name=failed::true\"\n exit \ n else\n echo\
75+ \ \" ::set-output name=failed::false\"\n fi\n\n echo \" Git status:\"\n git status\n \
76+ \n git add -A\n\n if [ -z \" $(git status --porcelain)\" ] ; then\n echo \" \
77+ No updated workflows; done.\"\n echo \" ::set-output name=skip::true\"\n fi\n "
7678 - name : Commit and PR
7779 working-directory : thisrepo
7880 if : steps.update.outputs.skip != 'true'
You can’t perform that action at this time.
0 commit comments