Skip to content

Commit efecf99

Browse files
committed
restructuring of linux builds and merged amd64 with multiarch
1 parent 4a17401 commit efecf99

2 files changed

Lines changed: 7 additions & 35 deletions

File tree

.github/workflows/cross-platform-build.yml

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -25,43 +25,15 @@ env:
2525
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
2626

2727
jobs:
28-
linux-amd64:
29-
runs-on: ubuntu-latest
30-
31-
steps:
32-
- uses: actions/checkout@v4
33-
34-
- name: Set up QEMU
35-
uses: docker/setup-qemu-action@v4
36-
37-
- name: Build (amd64)
38-
run: |
39-
docker run --rm \
40-
--platform linux/amd64 \
41-
-v ${{ github.workspace }}:/src \
42-
-w /src \
43-
debian:bookworm \
44-
bash -c "
45-
apt-get update -q &&
46-
apt-get install -y --no-install-recommends cmake g++ build-essential &&
47-
cmake -B build -DCMAKE_BUILD_TYPE=Release &&
48-
cmake --build build --config Release
49-
"
50-
51-
- name: Upload binary artifact
52-
uses: actions/upload-artifact@v4
53-
with:
54-
name: vmaware-linux-amd64
55-
path: build/vmaware
56-
if-no-files-found: error
57-
retention-days: 30
58-
59-
linux-multiarch:
28+
linux:
6029
runs-on: ubuntu-latest
6130
strategy:
6231
fail-fast: false
6332
matrix:
6433
include:
34+
- arch: amd64
35+
platform: linux/amd64
36+
image: debian:bookworm
6537
- arch: arm64
6638
platform: linux/arm64
6739
image: debian:bookworm
@@ -184,7 +156,7 @@ jobs:
184156
path: build\Release\vmaware_${{ github.run_number }}_${{ env.SHORT_SHA }}.exe
185157

186158
cli-test:
187-
needs: [linux-amd64]
159+
needs: [linux]
188160
runs-on: ubuntu-latest
189161

190162
steps:
@@ -202,7 +174,7 @@ jobs:
202174
bash auxiliary/test_cli.sh build/vmaware
203175
204176
cpp-standard-linux:
205-
needs: [linux-amd64, linux-multiarch]
177+
needs: [linux]
206178
runs-on: ubuntu-latest
207179
timeout-minutes: 10
208180
strategy:

src/vmaware.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5537,7 +5537,7 @@ struct VM {
55375537
#define VMAWARE_STR2(x) #x
55385538
#define VMAWARE_STR(x) VMAWARE_STR2(x)
55395539

5540-
const u32 ct_seed = []() constexpr -> u32 {
5540+
const u32 ct_seed = []() -> u32 {
55415541
constexpr char s[] = __DATE__ " " __TIME__ " " __FILE__ " " VMAWARE_STR(__LINE__);
55425542
u32 h = 2166136261u;
55435543
for (char c : s) {

0 commit comments

Comments
 (0)