Skip to content

Commit 514c90c

Browse files
fixup! [#70236] Add windows tests to gh actions
1 parent 1b61cc3 commit 514c90c

File tree

1 file changed

+3
-35
lines changed

1 file changed

+3
-35
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -119,50 +119,22 @@ jobs:
119119
popd
120120
popd
121121
122-
- name: Build SystemC For Linux
123-
run: |
124-
mkdir -p artifacts/systemc_linux
125-
pushd systemc
126-
mkdir -p build
127-
pushd build
128-
cmake .. -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_STANDARD=14
129-
make -j
130-
cp src/libsystemc.a ../../artifacts/systemc_linux/
131-
popd
132-
popd
133-
134122
- name: Upload systemC for Windows
135123
uses: actions/upload-artifact@v4
136124
with:
137125
name: systemc_windows-${{ github.run_id }}
138126
path: artifacts/systemc_windows
139127

140-
- name: Upload systemC for Linux
141-
uses: actions/upload-artifact@v4
142-
with:
143-
name: systemc_linux-${{ github.run_id }}
144-
path: artifacts/systemc_linux
145-
146128
build-examples-linux:
147129
name: Build Examples Linux
148130
runs-on: ubuntu-22.04
149-
needs: [build-zephyr-binaries, build-systemc]
150131
steps:
151132
- uses: actions/checkout@v4
152133

153134
- name: Install dependencies
154135
run: |
155-
sudo apt-get -qqy update && sudo apt-get install -qqy cmake clang git
156-
157-
- name: Fetch SystemC repo
158-
run: |
159-
git submodule update --init
160-
161-
- name: Download systemc built for linux
162-
uses: actions/download-artifact@v4
163-
with:
164-
name: systemc_linux-${{ github.run_id }}
165-
path: artifacts/systemc_linux
136+
sudo apt-get -qqy update
137+
sudo apt-get install -qqy libsystemc libsystemc-dev clang cmake
166138
167139
- name: Download and build Renode
168140
uses: antmicro/renode-test-action@v4
@@ -176,10 +148,7 @@ jobs:
176148
mkdir -p artifacts/linux_test_binaries
177149
mkdir -p build
178150
pushd build
179-
cmake .. -DCMAKE_CXX_STANDARD=14 \
180-
-DUSER_RENODE_DIR=/../renode \
181-
-DUSER_SYSTEMC_INCLUDE_DIR=$(pwd)/../systemc/src \
182-
-DUSER_SYSTEMC_LIB_DIR=$(pwd)/../artifacts/systemc_linux
151+
cmake .. -DCMAKE_CXX_STANDARD=14
183152
make
184153
popd
185154
for i in examples/*/; do
@@ -251,7 +220,6 @@ jobs:
251220
make
252221
popd
253222
for i in examples/*/; do
254-
ls -la
255223
cp "$i"/bin/* artifacts/windows_example_binaries
256224
rm -rf "$i"/bin
257225
done

0 commit comments

Comments
 (0)