Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 0 additions & 49 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ jobs:
artifact_name: "wasmer-linux-aarch64"
#llvm_url: "https://github.com/wasmerio/llvm-custom-builds/releases/download/21.x/llvm-linux-aarch64.tar.xz"
cross_compilation_artifact_name: "cross_compiled_from_linux"
use_sccache: false
use_rustcache: false
build_wasm: true
enable_llvm: false
enable_v8: false
Expand All @@ -65,7 +63,6 @@ jobs:
artifact_name: "wasmer-linux-amd64"
llvm_url: "https://github.com/wasmerio/llvm-custom-builds/releases/download/21.x/llvm-linux-amd64.tar.xz"
cross_compilation_artifact_name: "cross_compiled_from_linux"
use_sccache: false
build_wasm: true
enable_llvm: true
enable_v8: true
Expand All @@ -76,7 +73,6 @@ jobs:
llvm_url: "https://github.com/wasmerio/llvm-custom-builds/releases/download/21.x/llvm-darwin-amd64.tar.xz"
artifact_name: "wasmer-darwin-amd64"
cross_compilation_artifact_name: "cross_compiled_from_mac"
use_sccache: false
build_wasm: false
enable_llvm: true
enable_v8: true
Expand All @@ -86,7 +82,6 @@ jobs:
os: macos-14
target: aarch64-apple-darwin
artifact_name: "wasmer-darwin-arm64"
use_sccache: false
build_wasm: false
llvm_url: "https://github.com/wasmerio/llvm-custom-builds/releases/download/21.x/llvm-darwin-aarch64.tar.xz"
enable_llvm: true
Expand All @@ -99,7 +94,6 @@ jobs:
llvm_url: "https://github.com/wasmerio/llvm-custom-builds/releases/download/21.x/llvm-windows-amd64.tar.xz"
cross_compilation_artifact_name: "cross_compiled_from_win"
build_wasm: false
use_sccache: false
enable_llvm: true
enable_v8: false
enable_wasmi: true
Expand All @@ -115,7 +109,6 @@ jobs:
# enable_wasmi: true
# enable_wamr: false

container: ${{ matrix.container }}
env:
SCCACHE_AZURE_BLOB_CONTAINER: wasmerstoragesccacheblob
SCCACHE_AZURE_CONNECTION_STRING: ${{ secrets.SCCACHE_AZURE_CONNECTION_STRING }}
Expand Down Expand Up @@ -163,8 +156,6 @@ jobs:
with:
toolchain: ${{ env.MSRV }}
target: ${{ matrix.target }}
- uses: Swatinem/rust-cache@v2
if: ${{ matrix.use_sccache != true && matrix.use_rustcache != false }}
- name: Install LLVM (macOS Apple Silicon)
if: matrix.os == 'macos-13' && !matrix.llvm_url
run: |
Expand Down Expand Up @@ -206,18 +197,6 @@ jobs:
~/.cargo/registry
~/.cargo/git
key: ${{ matrix.build }}-${{ matrix.target }}-cargo-${{ hashFiles('Cargo.lock') }}-v1
- uses: actions/cache@v4
if: matrix.use_sccache
with:
path: ${{ runner.tool_cache }}/cargo-sccache
key: ${{ matrix.build }}-${{ matrix.target }}-sccache-bin-${{ env.CARGO_SCCACHE_VERSION }}-v1
- name: Install sccache
if: matrix.use_sccache
run: |
if [ ! -f '${{ runner.tool_cache }}/cargo-sccache/bin/sccache' ]; then
cargo install sccache --no-default-features --features=dist-client,azure --root '${{ runner.tool_cache }}/cargo-sccache'
fi
shell: bash
- name: Setup Rust target
run: |
mkdir -p .cargo
Expand All @@ -226,34 +205,6 @@ jobs:
target = "${{ matrix.target }}"
EOF
if: matrix.target
- name: Set sccache port
if: matrix.use_sccache && matrix.random_sccache_port
run: |
netstat -aln | awk '
$6 == "LISTEN" {
if ($4 ~ "[.:][0-9]+$") {
n = split($4, a, /[:.]/);
port = a[n];
p[port] = 1
}
}
END {
for (i = 3000; i < 65000 && p[i]; i++){};
if (i == 65000) {exit 1};
print "SCCACHE_SERVER_PORT=" i
}
' >> $GITHUB_ENV
# echo "SCCACHE_SERVER_PORT=9000"
echo "Setting random sccache port to: $SCCACHE_SERVER_PORT"
shell: bash
- name: Start sccache
if: matrix.use_sccache
run: |
chmod +x '${{ runner.tool_cache }}/cargo-sccache/bin/sccache'
'${{ runner.tool_cache }}/cargo-sccache/bin/sccache' --start-server
'${{ runner.tool_cache }}/cargo-sccache/bin/sccache' -s
echo 'RUSTC_WRAPPER=${{ runner.tool_cache }}/cargo-sccache/bin/sccache' >> $GITHUB_ENV
shell: bash
- name: Build C API headless
shell: bash
run: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/cloudcompiler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ env.MSRV }}
target: ${{ matrix.target }}
- name: Install wasm32-wasip1 target
shell: bash
run: |
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,6 @@ jobs:
uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ env.MSRV }}
target: ${{ matrix.metadata.target }}
- name: Install Nextest
uses: taiki-e/install-action@nextest
- name: Cache
Expand Down Expand Up @@ -1103,7 +1102,7 @@ jobs:
# if: false # matrix.build != 'macos-arm'
# shell: bash
# run: |
# export WASMER_PATH=`pwd`/target/${{ matrix.target }}/release/wasmer${{ matrix.exe }}
# export WASMER_PATH=`pwd`/target/${{ matrix.target }}/release/wasmer
# export WASMER_DIR=`pwd`/package && make test-integration-cli-ci
# env:
# TARGET: ${{ matrix.target }}
Expand All @@ -1123,7 +1122,7 @@ jobs:
# - name: Test CLI integration (WAMR)
# shell: bash
# run: |
# export WASMER_PATH=`pwd`/target/${{ matrix.target }}/release/wasmer${{ matrix.exe }}
# export WASMER_PATH=`pwd`/target/${{ matrix.target }}/release/wasmer
# export WASMER_DIR=`pwd`/package && make test-integration-cli-wamr-ci
# env:
# TARGET: ${{ matrix.target }}
Expand All @@ -1135,7 +1134,7 @@ jobs:
# - name: Test CLI integration (WASMI)
# shell: bash
# run: |
# export WASMER_PATH=`pwd`/target/${{ matrix.target }}/release/wasmer${{ matrix.exe }}
# export WASMER_PATH=`pwd`/target/${{ matrix.target }}/release/wasmer
# export WASMER_DIR=`pwd`/package && make test-integration-cli-wasmi-ci
# env:
# TARGET: ${{ matrix.target }}
Expand Down
Loading