Skip to content

Commit 70dde19

Browse files
authored
Merge pull request #5445 from input-output-hk/newhoggy/upgrade-workflows
Upgrade CI workflows
2 parents 8063de9 + 5dae278 commit 70dde19

File tree

2 files changed

+7
-326
lines changed

2 files changed

+7
-326
lines changed

.github/workflows/haskell-linux.yml

Lines changed: 0 additions & 277 deletions
This file was deleted.

.github/workflows/haskell.yml

Lines changed: 7 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
matrix:
2828
ghc: ["9.2.7", "9.6.2"]
2929
cabal: ["3.10.1.0"]
30-
os: [macos-latest, windows-latest]
30+
os: [macos-latest, windows-latest, ubuntu-latest]
3131

3232
env:
3333
# Modify this value to "invalidate" the cabal cache.
@@ -63,48 +63,18 @@ jobs:
6363
g+${{ (startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.run_id) || github.event.pull_request.number || github.ref }}
6464
6565
- name: Install Haskell
66-
uses: input-output-hk/setup-haskell@v1
66+
uses: input-output-hk/actions/haskell@latest
6767
id: setup-haskell
6868
with:
6969
ghc-version: ${{ matrix.ghc }}
7070
cabal-version: ${{ matrix.cabal }}
71-
pacman-packages: >
72-
mingw-w64-x86_64-pkg-config
73-
mingw-w64-x86_64-libsodium
74-
mingw-w64-x86_64-openssl
75-
base-devel
76-
autoconf-wrapper
77-
autoconf
78-
automake
79-
libtool
80-
make
8171

82-
- uses: actions/checkout@v3
83-
84-
- name: "[PowerShell] Add build script path"
85-
if: runner.os == 'Windows'
86-
shell: pwsh
87-
run: Add-Content $env:GITHUB_PATH "$(pwd)/.github/bin"
88-
89-
- name: "[Bash] Add build script path"
90-
if: runner.os != 'Windows'
91-
run: echo "$(pwd)/.github/bin" >> $GITHUB_PATH
92-
93-
94-
- name: "MAC: Install build environment (brew)"
95-
if: runner.os == 'macOS'
96-
run: |
97-
brew install libsodium
98-
99-
- name: "MAC: Install build environment (for secp256k1)"
100-
if: runner.os == 'macOS'
101-
run: brew install autoconf automake libtool
102-
103-
- name: Install secp256k1
104-
uses: input-output-hk/setup-secp256k1@v1
72+
- name: Install system dependencies
73+
uses: input-output-hk/actions/base@latest
10574
with:
106-
git-ref: ${{ env.SECP256K1_REF }}
107-
cache-version: ${{ env.SECP_CACHE_VERSION }}
75+
use-sodium-vrf: true # default is true
76+
77+
- uses: actions/checkout@v3
10878

10979
- name: Cabal update
11080
run: cabal update
@@ -118,9 +88,6 @@ jobs:
11888
11989
- name: Build dry run
12090
run: |
121-
# The tests call out to msys2 commands. We generally do not want to mix toolchains, so
122-
# we are very deliberate about only adding msys64 to the path where absolutely necessary.
123-
${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
12491
cabal build all --dry-run --minimize-conflict-set
12592
12693
# For users who fork cardano-node and want to define a writable cache, then can set up their own
@@ -164,16 +131,10 @@ jobs:
164131

165132
- name: Build core components
166133
run: |
167-
# The tests call out to msys2 commands. We generally do not want to mix toolchains, so
168-
# we are very deliberate about only adding msys64 to the path where absolutely necessary.
169-
${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
170134
cabal build cardano-node cardano-cli cardano-node-chairman cardano-submit-api -j1
171135
172136
- name: Build remaining components
173137
run: |
174-
# The tests call out to msys2 commands. We generally do not want to mix toolchains, so
175-
# we are very deliberate about only adding msys64 to the path where absolutely necessary.
176-
${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
177138
cabal build all
178139
179140
- name: Run tests
@@ -182,9 +143,6 @@ jobs:
182143
TMP: ${{ runner.temp }}
183144
KEEP_WORKSPACE: 1
184145
run: |
185-
# The tests call out to msys2 commands. We generally do not want to mix toolchains, so
186-
# we are very deliberate about only adding msys64 to the path where absolutely necessary.
187-
${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
188146
cabal test cardano-testnet cardano-node cardano-node-chairman cardano-submit-api
189147
190148
- name: Tar failed tests workspaces

0 commit comments

Comments
 (0)