Skip to content

Commit 86c48cd

Browse files
committed
Update workflows from templates.
1 parent d281370 commit 86c48cd

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/bump-version.bump.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ echo "::set-output name=release::${RELEASEVERS}"
6161

6262
# Derive a new bumped version from the release version.
6363
# Increment the last number in the string.
64-
VERSION="$(echo "${RELEASEVERS}" | gawk '{ start=match($0, /(.*)([0-9]+)([^0-9]*)$/, a) ; a[2] += 1 ; printf("%s%s%s", a[1], a[2], a[3]) }')"
64+
VERSION="$(echo "${RELEASEVERS}" | gawk '{ start=match($0, /(.*[^0-9])([0-9]+)([^0-9]*)$/, a) ; a[2] += 1 ; printf("%s%s%s", a[1], a[2], a[3]) }')"
6565
# Replace [-.]rc[-.$] with pre.
6666
VERSION="$(echo "${VERSION}" | sed -E 's/([-.])rc([-.]|$)/\1pre\2/')"
6767
# If no [-.]pre[-.$], then append -pre.

.github/bump-version.get.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ for FILE in ${VERSFILES} ; do
3838
VERS=$(cat "${FILE}")
3939
;;
4040
Cargo.toml)
41-
VERS=$(cargo metadata --manifest-path "${FILE}" --no-deps --offline --format-version 1 | jq -r '.packages[0].version')
41+
VERS=$(cargo metadata --manifest-path "${FILE}" --no-deps --offline --format-version 1 | jq -re '.packages[0].version')
4242
;;
4343
package.json)
4444
if [ "$(dirname "${FILE}")" = "." ] ; then
4545
# This is the root package.json, so we want .version.
46-
VERS=$(jq -r '.version' < "${FILE}")
46+
VERS=$(jq -re '.version' < "${FILE}")
4747
else
4848
# This isn't the root package.json, so we assume it depends on the package declared in the root package.json. We need to
4949
# get the root package's name.
50-
ROOTJSNAME=$(jq -r '.name' < package.json)
51-
VERS=$(jq -r ".dependencies[\"${ROOTJSNAME}\"]" < "${FILE}")
50+
ROOTJSNAME=$(jq -re '.name' < package.json)
51+
VERS=$(jq -re ".dependencies[\"${ROOTJSNAME}\"]" < "${FILE}")
5252
# Strip off any leading "^".
5353
VERS=${VERS/^/}
5454
fi

.github/workflows/notify.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Notify
1717
- Scala CI
1818
- Scala CVE
1919
- Scala Daily
20+
- Security Audit
2021
- Shell CI
2122
- TypeScript CI
2223
- Update Workflows
@@ -29,8 +30,6 @@ jobs:
2930
runs-on: ubuntu-20.04
3031
if: ${{ github.event.workflow_run.conclusion != 'success' }}
3132
steps:
32-
- name: Debug
33-
run: cat ${{ github.event_path }}
3433
- name: Post to Slack on failure
3534
run: "set -x\necho 'Failed a run of <${{ github.event.workflow_run.html_url\
3635
\ }}|${{ github.event.workflow_run.name }}> in ${{ github.event.repository.name\

0 commit comments

Comments
 (0)