Skip to content

Commit f5fa90e

Browse files
committed
Use arm64 version of parallelize.
1 parent a44f86b commit f5fa90e

File tree

6 files changed

+7
-53
lines changed

6 files changed

+7
-53
lines changed
File renamed without changes.
24.6 MB
Binary file not shown.
File renamed without changes.

.github/workflows/build.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ jobs:
9797
name: Setup
9898
shell: bash
9999
run: |
100-
bin=$(pwd)/.github/deps/${{ runner.os }}/bin
100+
arch="amd64"
101+
if [[ ${{ matrix.sys.os }} = "ubuntu-24.04-arm" ]]; then arch="arm64"; fi
102+
bin=$(pwd)/.github/deps/${{ runner.os }}/$arch/bin
101103
echo "Adding $bin to PATH"
102104
echo "$bin" >> $GITHUB_PATH
103105
@@ -136,7 +138,6 @@ jobs:
136138
shell: bash
137139
timeout-minutes: 15
138140
run: |
139-
export PATH="$(pwd)/.github/deps/${{ runner.os }}/bin:$PATH"
140141
parallelize "$(cat <<'EOF'
141142
[
142143
{

activestate.yaml

+4-51
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,6 @@ scripts:
114114
popd > /dev/null
115115
fi
116116
go build -tags "$GO_BUILD_TAGS" -o $BUILD_TARGET_DIR/$constants.BUILD_TARGET $constants.CLI_BUILDFLAGS $constants.CLI_PKGS
117-
- name: build-for
118-
language: bash
119-
standalone: true
120-
description: Builds the project with the specified OS as the target OS. (valid values darwin, linux, windows)
121-
value: |
122-
set -e
123-
$constants.SET_ENV
124-
export GOOS=${1}
125-
export GOARCH=amd64
126-
[ -z "${2}" ] && >&2 echo "must provide output file as 2nd arg" && exit 1
127-
go build -tags "internal $GO_BUILD_TAGS" -o ${2} $constants.CLI_BUILDFLAGS $constants.CLI_PKGS
128117
- name: build-svc
129118
language: bash
130119
standalone: true
@@ -260,46 +249,10 @@ scripts:
260249
standalone: true
261250
description: Generates our github workflows
262251
value: |
263-
$scripts.build-for.path() "windows" ./.github/deps/Windows/bin/state.exe
264-
$scripts.build-for.path() "linux" ./.github/deps/Linux/bin/state
265-
$scripts.build-for.path() "darwin" ./.github/deps/macOS/bin/state
266-
267-
GOOS=windows go build -o .github/deps/Windows/bin/parallelize.exe github.com/ActiveState/cli/scripts/ci/parallelize/
268-
GOOS=linux go build -o .github/deps/Linux/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
269-
GOOS=darwin go build -o .github/deps/macOS/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
270-
- name: update-workflow-assets
271-
language: bash
272-
standalone: true
273-
description: Generates our github workflows
274-
value: |
275-
[ -z "${2}" ] && >&2 echo "Usage: update-workflow-assets [branch] [version]" && exit 1
276-
277-
tmpDir=$(mktemp -d)
278-
pushd $tmpDir
279-
wget https://state-tool.s3.amazonaws.com/update/state/${1}/${2}/darwin-amd64/state-darwin-amd64-${2}.tar.gz
280-
tar xzf state-darwin-amd64-${2}.tar.gz
281-
cp -Rfv state-install/bin/state $project.path()/.github/deps/macOS/bin
282-
cp -Rfv state-install/bin/state-svc $project.path()/.github/deps/macOS/bin
283-
popd
284-
rm -Rf $tmpDir
285-
286-
tmpDir=$(mktemp -d)
287-
pushd $tmpDir
288-
wget https://state-tool.s3.amazonaws.com/update/state/${1}/${2}/linux-amd64/state-linux-amd64-${2}.tar.gz
289-
tar xzf state-linux-amd64-${2}.tar.gz
290-
cp -Rfv state-install/bin/state $project.path()/.github/deps/Linux/bin
291-
cp -Rfv state-install/bin/state-svc $project.path()/.github/deps/Linux/bin
292-
popd
293-
rm -Rf $tmpDir
294-
295-
tmpDir=$(mktemp -d)
296-
pushd $tmpDir
297-
wget https://state-tool.s3.amazonaws.com/update/state/${1}/${2}/windows-amd64/state-windows-amd64-${2}.zip
298-
unzip state-windows-amd64-${2}.zip
299-
cp -Rfv state-install/bin/state.exe $project.path()/.github/deps/Windows/bin
300-
cp -Rfv state-install/bin/state-svc.exe $project.path()/.github/deps/Windows/bin
301-
popd
302-
rm -Rf $tmpDir
252+
GOOS=windows go build -o .github/deps/Windows/amd64/bin/parallelize.exe github.com/ActiveState/cli/scripts/ci/parallelize/
253+
GOOS=linux go build -o .github/deps/Linux/amd64/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
254+
GOOS=linux GOARCH=arm64 go build -o .github/deps/Linux/arm64/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
255+
GOOS=darwin go build -o .github/deps/macOS/amd64/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
303256
- name: test
304257
language: bash
305258
standalone: true

0 commit comments

Comments
 (0)