Skip to content

Commit 3a107ae

Browse files
committed
Merge pull request #1233 from bettio/fix-release-workflows
Fix release workflows Revert 85ca4ce for the mentioned files. These changes are made under both the "Apache 2.0" and the "GNU Lesser General Public License 2.1 or later" license terms (dual license). SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
2 parents 3c96e75 + 81923c4 commit 3a107ae

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

.github/workflows/build-libraries.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ permissions:
1616

1717
jobs:
1818
build-libraries:
19-
runs-on: "ubuntu-24.04"
20-
container: erlang:27
19+
runs-on: "ubuntu-22.04"
2120
strategy:
2221
fail-fast: false
2322

@@ -27,6 +26,11 @@ jobs:
2726
with:
2827
submodules: 'recursive'
2928

29+
- uses: erlef/setup-beam@v1
30+
with:
31+
otp-version: "24"
32+
elixir-version: "1.11"
33+
3034
- name: "APT update"
3135
run: sudo apt update -y
3236

.github/workflows/build-linux-artifacts.yaml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,38 @@ on:
1414
permissions:
1515
contents: write
1616

17+
env:
18+
otp_version: 24
19+
elixir_version: 1.14
20+
1721
jobs:
1822
compile_tests:
19-
runs-on: ubuntu-24.04
20-
container: erlang:27
23+
runs-on: ubuntu-22.04
2124
steps:
2225
- name: Checkout repo
2326
uses: actions/checkout@v4
2427

28+
- uses: erlef/setup-beam@v1
29+
with:
30+
otp-version: ${{ env.otp_version }}
31+
elixir-version: ${{ env.elixir_version }}
32+
2533
- name: apt update
2634
run: sudo apt update
2735

2836
- name: Install required packages
29-
run: sudo apt install -y cmake gperf zlib1g-dev ninja-build
37+
run: sudo apt install -y gperf
3038

3139
- name: Compile test modules
3240
run: |
3341
set -e
3442
mkdir build_tests
3543
cd build_tests
36-
cmake .. -G Ninja -DAVM_WARNINGS_ARE_ERRORS=ON
37-
ninja erlang_test_modules test_estdlib test_eavmlib test_alisp
44+
cmake ..
45+
make erlang_test_modules
46+
make test_estdlib
47+
make test_eavmlib
48+
make test_alisp
3849
3950
- name: Upload test modules
4051
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)