Merge remote-tracking branch 'upstream/master'

Emurgo · Sep 8, 2023 · c3c27c8 · c3c27c8
2 parents 1eeb996 + 4139153
commit c3c27c8
Show file tree

Hide file tree

Showing 316 changed files with 6,901 additions and 26,825 deletions.
diff --git a/mlc_config.json → .github/mlc_config.json b/mlc_config.json → .github/mlc_config.json
diff --git a/.github/workflows/github-page.yml b/.github/workflows/github-page.yml
@@ -22,7 +22,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2023-07-11"
+      CABAL_CACHE_VERSION: "2023-07-28"
 
       # Modify this value to "invalidate" the secp cache.
       SECP_CACHE_VERSION: "2022-12-30"

diff --git a/.github/workflows/haskell-linux.yml b/.github/workflows/haskell-linux.yml
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -25,13 +25,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.2.7"]
+        ghc: ["9.2.7", "9.6.2"]
         cabal: ["3.10.1.0"]
-        os: [macos-latest, windows-latest]
+        os: [macos-latest, windows-latest, ubuntu-latest]
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2023-07-11"
+      CABAL_CACHE_VERSION: "2023-09-05"
 
       # Modify this value to "invalidate" the secp cache.
       SECP_CACHE_VERSION: "2022-12-30"
@@ -63,48 +63,18 @@ jobs:
         g+${{ (startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.run_id) || github.event.pull_request.number || github.ref }}
 
     - name: Install Haskell
-      uses: input-output-hk/setup-haskell@v1
+      uses: input-output-hk/actions/haskell@latest
       id: setup-haskell
       with:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: ${{ matrix.cabal }}
-        pacman-packages: >
-          mingw-w64-x86_64-pkg-config
-          mingw-w64-x86_64-libsodium
-          mingw-w64-x86_64-openssl
-          base-devel
-          autoconf-wrapper
-          autoconf
-          automake
-          libtool
-          make
 
-    - uses: actions/checkout@v3
-
-    - name: "[PowerShell] Add build script path"
-      if: runner.os == 'Windows'
-      shell: pwsh
-      run: Add-Content $env:GITHUB_PATH "$(pwd)/.github/bin"
-
-    - name: "[Bash] Add build script path"
-      if: runner.os != 'Windows'
-      run: echo "$(pwd)/.github/bin" >> $GITHUB_PATH
-
-
-    - name: "MAC: Install build environment (brew)"
-      if: runner.os == 'macOS'
-      run: |
-        brew install libsodium
-
-    - name: "MAC: Install build environment (for secp256k1)"
-      if: runner.os == 'macOS'
-      run: brew install autoconf automake libtool
-
-    - name: Install secp256k1
-      uses: input-output-hk/setup-secp256k1@v1
+    - name: Install system dependencies
+      uses: input-output-hk/actions/base@latest
       with:
-        git-ref: ${{ env.SECP256K1_REF }}
-        cache-version: ${{ env.SECP_CACHE_VERSION }}
+        use-sodium-vrf: true # default is true
+
+    - uses: actions/checkout@v3
 
     - name: Cabal update
       run: cabal update
@@ -118,9 +88,6 @@ jobs:
 
     - name: Build dry run
       run: |
-        # The tests call out to msys2 commands. We generally do not want to mix toolchains, so
-        # we are very deliberate about only adding msys64 to the path where absolutely necessary.
-        ${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
         cabal build all --dry-run --minimize-conflict-set
 
     # For users who fork cardano-node and want to define a writable cache, then can set up their own
@@ -164,16 +131,10 @@ jobs:
 
     - name: Build core components
       run: |
-        # The tests call out to msys2 commands. We generally do not want to mix toolchains, so
-        # we are very deliberate about only adding msys64 to the path where absolutely necessary.
-        ${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
         cabal build cardano-node cardano-cli cardano-node-chairman cardano-submit-api -j1
 
     - name: Build remaining components
       run: |
-        # The tests call out to msys2 commands. We generally do not want to mix toolchains, so
-        # we are very deliberate about only adding msys64 to the path where absolutely necessary.
-        ${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
         cabal build all
 
     - name: Run tests
@@ -182,9 +143,6 @@ jobs:
         TMP: ${{ runner.temp }}
         KEEP_WORKSPACE: 1
       run: |
-        # The tests call out to msys2 commands. We generally do not want to mix toolchains, so
-        # we are very deliberate about only adding msys64 to the path where absolutely necessary.
-        ${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
         cabal test cardano-testnet cardano-node cardano-node-chairman cardano-submit-api
 
     - name: Tar failed tests workspaces