Skip to content

Commit 8174989

Browse files
Merge pull request #5123 from swiftwasm/katei/ci-remove-install-dependencies
[ci] Remove utils/webassembly/install-dependencies.sh
2 parents dab115f + c856b56 commit 8174989

File tree

3 files changed

+4
-73
lines changed

3 files changed

+4
-73
lines changed

.github/workflows/build-toolchain.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ jobs:
141141
142142
- run: chmod -R 777 ./build-cache
143143
if: ${{ steps.build-cache.outputs.cache-hit }}
144+
- name: Install Homebrew dependencies
145+
if: ${{ startsWith(matrix.build_os, 'macos-') }}
146+
run: brew bundle --file swift/Brewfile && brew install wasmer
144147
- name: Build ${{ matrix.target }} installable archive on Docker container
145148
if: ${{ matrix.container != null }}
146149
timeout-minutes: 300 # Exit before 6 hours limit to allow cache upload

utils/webassembly/ci.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,10 @@ set -ex
55
SOURCE_PATH="$(cd "$(dirname $0)/../../.." && pwd)"
66
SWIFT_PATH=$SOURCE_PATH/swift
77
UTILS_PATH=$SWIFT_PATH/utils/webassembly
8-
BUILD_SCRIPT=$UTILS_PATH/build-toolchain.sh
9-
BUILD_SDK_PATH="$SOURCE_PATH/build-sdk"
108

11-
export WASMER_DIR="$BUILD_SDK_PATH/wasmer"
12-
13-
$UTILS_PATH/install-dependencies.sh "$BUILD_SDK_PATH"
9+
$SWIFT_PATH/utils/update-checkout --clone --scheme wasm --skip-repository swift
1410
$UTILS_PATH/install-build-sdk.sh
1511

16-
export PATH="$BUILD_SDK_PATH/bin:$PATH"
1712
export SCCACHE_CACHE_SIZE="50G"
1813
export SCCACHE_DIR="$SOURCE_PATH/build-cache"
1914

utils/webassembly/install-dependencies.sh

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)