Skip to content

Commit e9ad6e6

Browse files
committed
Merge branch 'main' into add/trap_func
2 parents 520657d + a6a9f1f commit e9ad6e6

85 files changed

Lines changed: 843 additions & 266 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build_iwasm_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,15 @@ jobs:
151151
working-directory: ${{ inputs.cwd }}
152152

153153
- name: Compress the binary on Windows
154-
if: inputs.runner == 'windows-latest'
154+
if: inputs.runner == 'windows-2022'
155155
run: |
156156
tar -czf iwasm${{ matrix.suffix }}-${{ inputs.ver_num }}-${{ inputs.runner }}.tar.gz iwasm.exe
157157
Compress-Archive -Path iwasm.exe -DestinationPath iwasm${{ matrix.suffix }}-${{ inputs.ver_num }}-${{ inputs.runner }}.zip
158158
mv iwasm${{ matrix.suffix }}-${{ inputs.ver_num }}-${{ inputs.runner }}.* ../
159159
working-directory: ${{ inputs.cwd }}/build/Release
160160

161161
- name: compress the binary on non-Windows
162-
if: inputs.runner != 'windows-latest'
162+
if: inputs.runner != 'windows-2022'
163163
run: |
164164
# Follow the symlink to the actual binary file
165165
tar --dereference -czf iwasm${{ matrix.suffix }}-${{ inputs.ver_num }}-${{ inputs.runner }}.tar.gz iwasm

.github/workflows/build_llvm_libraries.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ jobs:
118118
key: 0-ccache-${{ inputs.os }}-${{ steps.get_last_commit.outputs.last_commit }}
119119
restore-keys: |
120120
0-ccache-${{ inputs.os }}
121-
if: steps.retrieve_llvm_libs.outputs.cache-hit != 'true' && inputs.os == 'windows-latest'
121+
if: steps.retrieve_llvm_libs.outputs.cache-hit != 'true' && inputs.os == 'windows-2022'
122122

123123
# Install tools on Windows
124124
- run: choco install -y ccache ninja
125-
if: steps.retrieve_llvm_libs.outputs.cache-hit != 'true' && inputs.os == 'windows-latest'
125+
if: steps.retrieve_llvm_libs.outputs.cache-hit != 'true' && inputs.os == 'windows-2022'
126126

127127
- name: Build LLVM libraries
128128
if: steps.retrieve_llvm_libs.outputs.cache-hit != 'true'

.github/workflows/build_wamr_vscode_ext.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@v5
2828

2929
- name: Use Node.js 18.x
30-
uses: actions/setup-node@v4
30+
uses: actions/setup-node@v5
3131
with:
3232
node-version: 18.x
3333

.github/workflows/build_wamrc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ jobs:
8787
working-directory: wamr-compiler
8888

8989
- name: Compress the binary on Windows
90-
if: inputs.runner == 'windows-latest' && inputs.release
90+
if: inputs.runner == 'windows-2022' && inputs.release
9191
run: |
9292
tar -czf wamrc-${{ inputs.ver_num }}-${{ inputs.runner }}.tar.gz wamrc.exe
9393
Compress-Archive -Path wamrc.exe -DestinationPath wamrc-${{ inputs.ver_num }}-${{ inputs.runner }}.zip
9494
mv wamrc-${{ inputs.ver_num }}-${{ inputs.runner }}.* ../
9595
working-directory: wamr-compiler/build/Release
9696

9797
- name: compress the binary on non-Windows
98-
if: inputs.runner != 'windows-latest' && inputs.release
98+
if: inputs.runner != 'windows-2022' && inputs.release
9999
run: |
100100
# Follow the symlink to the actual binary file
101101
tar --dereference -czf wamrc-${{ inputs.ver_num }}-${{ inputs.runner }}.tar.gz wamrc

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353

5454
# Initializes the CodeQL tools for scanning.
5555
- name: Initialize CodeQL
56-
uses: github/codeql-action/init@v3.29.11
56+
uses: github/codeql-action/init@v3.30.1
5757
with:
5858
languages: ${{ matrix.language }}
5959

@@ -70,7 +70,7 @@ jobs:
7070
- run: |
7171
./.github/scripts/codeql_buildscript.sh
7272
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@v3.29.11
73+
uses: github/codeql-action/analyze@v3.30.1
7474
with:
7575
category: "/language:${{matrix.language}}"
7676
upload: false
@@ -99,7 +99,7 @@ jobs:
9999
output: ${{ steps.step1.outputs.sarif-output }}/cpp.sarif
100100

101101
- name: Upload CodeQL results to code scanning
102-
uses: github/codeql-action/upload-sarif@v3.29.11
102+
uses: github/codeql-action/upload-sarif@v3.30.1
103103
with:
104104
sarif_file: ${{ steps.step1.outputs.sarif-output }}
105105
category: "/language:${{matrix.language}}"

.github/workflows/compilation_on_android_ubuntu.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
- name: Build wamrc
125125
run: |
126126
mkdir build && cd build
127-
cmake ..
127+
cmake .. -DCMAKE_C_FLAGS="-Werror"
128128
cmake --build . --config Release --parallel 4
129129
working-directory: wamr-compiler
130130

@@ -166,6 +166,7 @@ jobs:
166166
"-DWAMR_BUILD_MULTI_MEMORY=1",
167167
"-DWAMR_BUILD_SHARED=1",
168168
"-DWAMR_BUILD_EXTENDED_CONST_EXPR=1",
169+
"-DWAMR_BUILD_LIME1=1 -DWAMR_BUILD_BULK_MEMORY=0 -DWAMR_BUILD_REF_TYPES=0 -DWAMR_BUILD_SIMD=0",
169170
]
170171
os: [ubuntu-22.04]
171172
platform: [android, linux]
@@ -293,15 +294,15 @@ jobs:
293294
if: matrix.platform == 'linux'
294295
run: |
295296
mkdir build && cd build
296-
cmake .. ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }}
297+
cmake .. -DCMAKE_C_FLAGS="-Werror" ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }}
297298
cmake --build . --config Release --parallel 4
298299
working-directory: product-mini/platforms/${{ matrix.platform }}
299300

300301
- name: Build iwasm for android
301302
if: matrix.platform == 'android'
302303
run: |
303304
mkdir build && cd build
304-
cmake .. ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }} \
305+
cmake .. -DCMAKE_C_FLAGS="-Werror" ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }} \
305306
-DWAMR_BUILD_TARGET=X86_64
306307
cmake --build . --config Release --parallel 4
307308
working-directory: product-mini/platforms/${{ matrix.platform }}

.github/workflows/compilation_on_macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
- name: Build wamrc
108108
run: |
109109
mkdir build && cd build
110-
cmake ..
110+
cmake .. -DCMAKE_C_FLAGS="-Werror"
111111
cmake --build . --config Release --parallel 4
112112
working-directory: wamr-compiler
113113

@@ -213,7 +213,7 @@ jobs:
213213
- name: Build iwasm
214214
run: |
215215
mkdir build && cd build
216-
cmake .. ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }}
216+
cmake .. -DCMAKE_C_FLAGS="-Werror" ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }}
217217
cmake --build . --config Release --parallel 4
218218
working-directory: product-mini/platforms/${{ matrix.platform }}
219219

.github/workflows/compilation_on_windows.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (C) 2019 Intel Corporation. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
33

4-
name: compilation on windows-latest
4+
name: compilation on windows-2022
55

66
on:
77
# will be triggered on PR events
@@ -63,11 +63,11 @@ jobs:
6363
actions: write
6464
uses: ./.github/workflows/build_llvm_libraries.yml
6565
with:
66-
os: "windows-latest"
66+
os: "windows-2022"
6767
arch: "AArch64 ARM Mips RISCV X86"
6868

6969
build_iwasm:
70-
runs-on: windows-latest
70+
runs-on: windows-2022
7171
strategy:
7272
matrix:
7373
build_options:
@@ -105,7 +105,7 @@ jobs:
105105
strategy:
106106
matrix:
107107
include:
108-
- os: windows-latest
108+
- os: windows-2022
109109
llvm_cache_key: ${{ needs.build_llvm_libraries_on_windows.outputs.cache_key }}
110110
steps:
111111
- name: checkout
@@ -136,7 +136,7 @@ jobs:
136136
working-directory: wamr-compiler
137137

138138
test:
139-
runs-on: windows-latest
139+
runs-on: windows-2022
140140
needs: [build_iwasm, build_wamrc]
141141
strategy:
142142
fail-fast: false

.github/workflows/release_process.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
needs: [create_tag, create_release]
106106
uses: ./.github/workflows/build_llvm_libraries.yml
107107
with:
108-
os: "windows-latest"
108+
os: "windows-2022"
109109
arch: "AArch64 ARM Mips RISCV X86"
110110

111111
#
@@ -142,7 +142,7 @@ jobs:
142142
with:
143143
llvm_cache_key: ${{ needs.build_llvm_libraries_on_windows.outputs.cache_key }}
144144
release: true
145-
runner: windows-latest
145+
runner: windows-2022
146146
upload_url: ${{ needs.create_release.outputs.upload_url }}
147147
ver_num: ${{ needs.create_tag.outputs.new_ver }}
148148

@@ -180,7 +180,7 @@ jobs:
180180
with:
181181
cwd: product-mini/platforms/windows
182182
llvm_cache_key: ${{ needs.build_llvm_libraries_on_windows.outputs.cache_key }}
183-
runner: windows-latest
183+
runner: windows-2022
184184
upload_url: ${{ needs.create_release.outputs.upload_url }}
185185
ver_num: ${{ needs.create_tag.outputs.new_ver}}
186186

.github/workflows/supply_chain.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ jobs:
6060

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@5b49155c7f37b5ec074ffd26b428e6b64b1bf412
63+
uses: github/codeql-action/upload-sarif@144880b6f0c9977178ab4000985a49023783178f
6464
with:
6565
sarif_file: results.sarif

0 commit comments

Comments
 (0)