Skip to content

Commit e2b0189

Browse files
committed
👷 Fix CI
1 parent e7c957d commit e2b0189

File tree

2 files changed

+38
-36
lines changed

2 files changed

+38
-36
lines changed

.github/workflows/publish-packages.yml

+33-35
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
build:
23-
- {
24-
NAME: linux-x64-glibc,
25-
OS: ubuntu-20.04,
26-
TOOLCHAIN: stable,
27-
TARGET: x86_64-unknown-linux-gnu,
28-
}
29-
- {
30-
NAME: linux-x86-glibc,
31-
OS: ubuntu-22.04,
32-
TOOLCHAIN: stable,
33-
TARGET: i686-unknown-linux-gnu,
34-
}
35-
- {
36-
NAME: linux-arm64-glibc,
37-
OS: ubuntu-20.04,
38-
TOOLCHAIN: stable,
39-
TARGET: aarch64-unknown-linux-gnu,
40-
}
23+
# - {
24+
# NAME: linux-x64-glibc,
25+
# OS: ubuntu-20.04,
26+
# TOOLCHAIN: stable,
27+
# TARGET: x86_64-unknown-linux-gnu,
28+
# }
29+
# - {
30+
# NAME: linux-x86-glibc,
31+
# OS: ubuntu-22.04,
32+
# TOOLCHAIN: stable,
33+
# TARGET: i686-unknown-linux-gnu,
34+
# }
35+
# - {
36+
# NAME: linux-arm64-glibc,
37+
# OS: ubuntu-20.04,
38+
# TOOLCHAIN: stable,
39+
# TARGET: aarch64-unknown-linux-gnu,
40+
# }
4141
- {
4242
NAME: win32-x64-msvc,
4343
OS: windows-2022,
@@ -50,18 +50,18 @@ jobs:
5050
TOOLCHAIN: stable,
5151
TARGET: i686-pc-windows-msvc,
5252
}
53-
- {
54-
NAME: darwin-x64,
55-
OS: macos-11,
56-
TOOLCHAIN: stable,
57-
TARGET: x86_64-apple-darwin,
58-
}
59-
- {
60-
NAME: darwin-arm64,
61-
OS: macos-11,
62-
TOOLCHAIN: stable,
63-
TARGET: aarch64-apple-darwin,
64-
}
53+
# - {
54+
# NAME: darwin-x64,
55+
# OS: macos-11,
56+
# TOOLCHAIN: stable,
57+
# TARGET: x86_64-apple-darwin,
58+
# }
59+
# - {
60+
# NAME: darwin-arm64,
61+
# OS: macos-11,
62+
# TOOLCHAIN: stable,
63+
# TARGET: aarch64-apple-darwin,
64+
# }
6565
steps:
6666
- name: Checkout
6767
uses: actions/checkout@v4
@@ -168,11 +168,11 @@ jobs:
168168

169169
- name: Publish the NPM package
170170
run: |
171-
echo "DRY_RUN=${DRY_RUN}"
172-
cd ${NODE_PKG}
171+
echo "DRY_RUN=${{ env.DRY_RUN }}"
172+
cd ${{ env.node_pkg }}
173173
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
174174
npm set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
175-
if [ "${DRY_RUN}" = "true" ]; then
175+
if [ "${{ env.DRY_RUN }}" = "true" ]; then
176176
echo "Running npm publish in dry-run mode"
177177
npm publish --access public --dry-run
178178
else
@@ -181,8 +181,6 @@ jobs:
181181
shell: bash
182182
env:
183183
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
184-
DRY_RUN: ${{ env.DRY_RUN }}
185-
NODE_PKG: ${{ env.node_pkg }}
186184
publish-wrapper-npm-package:
187185
name: Publish wrapper NPM packages
188186
runs-on: ubuntu-20.04

.github/workflows/run-tests.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ jobs:
103103

104104
- uses: actions/checkout@v4
105105

106+
- name: Set ON_RELEASE_BRANCH based on trigger
107+
run: echo "ON_RELEASE_BRANCH=true" >> $GITHUB_ENV
108+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release/v')
109+
106110
- name: Use Node ${{ matrix.node }}
107111
uses: actions/setup-node@v4
108112
with:
@@ -169,7 +173,7 @@ jobs:
169173

170174
- name: Install the Bolt CLI and create & build a new project
171175
shell: bash
172-
if: ${{ !startsWith(github.ref, 'refs/heads/release/v') }}
176+
if: ${{ env.ON_RELEASE_BRANCH != 'true' }}
173177
run: |
174178
export PATH="/home/runner/.local/share/solana/install/active_release/bin:$PATH"
175179
cargo install --path cli --force --locked

0 commit comments

Comments
 (0)