Skip to content

Commit f75ed77

Browse files
authored
Merge pull request #4708 from input-output-hk/newhoggy/update-github-actions-ci
Update GitHub actions CI
2 parents 28f0ad4 + 183afa3 commit f75ed77

6 files changed

+222
-255
lines changed
+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
# I don't understand why this just vanishes.
3+
export PATH=/usr/bin:$PATH
4+
5+
echo ======== env =======
6+
env | grep CI_
7+
echo ========
8+
echo $PATH
9+
echo ========
10+
git clone https://github.com/bitcoin-core/secp256k1
11+
cd secp256k1
12+
git switch $SECP256K1_REF --detach
13+
./autogen.sh
14+
./configure $CI_SECP_FLAGS --enable-module-schnorrsig --enable-experimental
15+
make
16+
make check
17+
$CI_SECP_INSTALL_CMD make install
18+
cd ..
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package cardano-crypto-praos
2+
flags: -external-libsodium-vrf
3+
4+
package HsOpenSSL
5+
flags: +use-pkg-config
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package cardano-crypto-praos
2+
flags: -external-libsodium-vrf
3+
4+
package HsOpenSSL
5+
flags: +use-pkg-config
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package cardano-crypto-praos
2+
flags: -external-libsodium-vrf
3+
4+
package HsOpenSSL
5+
flags: +use-pkg-config

.github/workflows/github-page.yml

+12-17
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,13 @@ jobs:
4949
sudo apt-get -y remove --purge software-properties-common
5050
sudo apt-get -y autoremove
5151
52-
- name: Install secp256k1 (Linux)
53-
if: matrix.os == 'ubuntu-latest'
54-
run: |
55-
sudo apt-get -y install autoconf automake libtool
56-
mkdir secp256k1-sources
57-
cd secp256k1-sources
58-
git clone https://github.com/bitcoin-core/secp256k1.git
59-
cd secp256k1
60-
git reset --hard $SECP256K1_REF
61-
./autogen.sh
62-
./configure --prefix=/usr --enable-module-schnorrsig --enable-experimental
63-
make
64-
make check
65-
sudo make install
66-
cd ../..
52+
- name: "LINUX: Install secp256k1"
53+
if: runner.os != 'Windows'
54+
shell: bash
55+
env:
56+
CI_SECP_FLAGS: "--prefix=/usr"
57+
CI_SECP_INSTALL_CMD: sudo
58+
run: bash .github/workflows/build-secp256k1.bash
6759

6860
- name: Cabal update
6961
run: cabal update
@@ -75,8 +67,11 @@ jobs:
7567
cat cabal.project | sed 's|reorder-goals: True|reorder-goals: False|g' > cabal.project.tmp
7668
mv cabal.project.tmp cabal.project
7769
78-
- name: Use cabal.project.local.github-pages
79-
run: cp .github/workflows/cabal.project.local.github-pages cabal.project.local
70+
- name: combine github-pages, and machine local project files.
71+
run: |
72+
cat .github/workflows/cabal.project.local.github-pages \
73+
".github/workflows/cabal.project.local.ci.$(uname -s)" \
74+
| tee cabal.project.local
8075
8176
- name: Dry run
8277
run: |

0 commit comments

Comments
 (0)