Skip to content

Commit 4bb3100

Browse files
committed
Update workflows from templates.
1 parent 2fc7c4d commit 4bb3100

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

.github/bump-version.set.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ if [ "${NEWVERS/-*/}" = "0.0.0" ] ; then
2727
echo "Illegal zero version '${NEWVERS}'" 1>&2
2828
exit 1
2929
fi
30-
# Sanity check: Must start with a valid semver.
31-
if ! [[ ${NEWVERS} =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))? ]] ; then
30+
# Sanity check: Must start with a valid semver, with an optional leading "v".
31+
if ! [[ ${NEWVERS} =~ ^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))? ]] ; then
3232
echo "Invalid version '${NEWVERS}'" 1>&2
3333
exit 1
3434
fi

.github/workflows/typescript-ci.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ jobs:
2929
target: x86_64-unknown-linux-gnu
3030
- os: windows-2019
3131
target: x86_64-pc-windows-msvc
32-
arch:
33-
- x64
3432
include:
3533
- system:
3634
os:
@@ -40,7 +38,6 @@ jobs:
4038
target: aarch64-apple-darwin
4139
node_version: 16
4240
rust_version: 1.56.0
43-
arch: arm64
4441
- system:
4542
os:
4643
- self-hosted
@@ -49,7 +46,6 @@ jobs:
4946
target: aarch64-apple-darwin
5047
node_version: 16
5148
rust_version: stable
52-
arch: arm64
5349
- system:
5450
os:
5551
- self-hosted
@@ -58,14 +54,12 @@ jobs:
5854
target: aarch64-apple-darwin
5955
node_version: 16
6056
rust_version: beta
61-
arch: arm64
6257
fail-fast: false
6358
steps:
6459
- uses: actions/checkout@v3
6560
- uses: actions/setup-node@v3
6661
with:
6762
node-version: ${{ matrix.node_version }}
68-
architecture: ${{ matrix.arch }}
6963
cache: yarn
7064
- uses: actions-rs/toolchain@v1
7165
with:

.github/workflows/update-workflows.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ jobs:
1616
update:
1717
runs-on: ubuntu-20.04
1818
steps:
19-
- uses: actions/setup-python@v3
19+
- uses: actions/setup-python@v4
20+
with:
21+
python-version: 3.x
2022
- name: Install JSON tools
2123
run: pip3 install jsonpatch pyyaml
2224
- name: Build yaml2json, json2yaml

0 commit comments

Comments
 (0)