Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
- Update cabal cache
- Cleanup yml files
- Update ci to Cabal 3.10.2.0
- Move `Changelog.md` to the appropiate section in cabal files
  • Loading branch information
jasagredo committed Nov 20, 2023
1 parent a4e6a44 commit 0b239f4
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 75 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/cabal.project.local.ci
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
package HsOpenSSL
flags: +use-pkg-config
5 changes: 0 additions & 5 deletions .github/workflows/cabal.project.local.ci.Darwin

This file was deleted.

5 changes: 0 additions & 5 deletions .github/workflows/cabal.project.local.ci.Linux

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/cabal.project.local.github-pages
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@ write-ghc-environment-files: always

ignore-project: False

package cardano-crypto-praos
flags: -external-libsodium-vrf

tests: False
9 changes: 2 additions & 7 deletions .github/workflows/check-cabal-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Workaround runner image issue
if: runner.os == 'Linux'
# https://github.com/actions/runner-images/issues/7061
run: sudo chown -R $USER /usr/local/.ghcup

- name: Install Haskell
uses: input-output-hk/setup-haskell@v1
uses: input-output-hk/actions/haskell@latest
id: setup-haskell
with:
cabal-version: "3.10.1.0"
cabal-version: "3.10.2.0"

- uses: actions/checkout@v3

Expand Down
38 changes: 9 additions & 29 deletions .github/workflows/github-page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,59 +16,39 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.2.7"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8"]
cabal: ["3.10.2.0"]
os: [ubuntu-latest]

env:
# Modify this value to "invalidate" the cabal cache.
CABAL_CACHE_VERSION: "2023-07-28"

# Modify this value to "invalidate" the secp cache.
SECP_CACHE_VERSION: "2022-12-30"

# current ref from: 27.02.2022
SECP256K1_REF: ac83be33d0956faf6b7f61a60ab524ef7d6a473a

steps:
- name: Workaround runner image issue
if: runner.os == 'Linux'
# https://github.com/actions/runner-images/issues/7061
run: sudo chown -R $USER /usr/local/.ghcup

- 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 }}

- name: Install system dependencies
uses: input-output-hk/actions/base@latest
with:
use-sodium-vrf: true # default is true

- uses: actions/checkout@v3

- name: Add build script path
run: echo "$(pwd)/.github/bin" >> $GITHUB_PATH

- name: Install build environment
run: |
sudo apt-get update
sudo apt-get -y install libsodium23 libsodium-dev
sudo apt-get -y install libsystemd0 libsystemd-dev
sudo apt-get -y remove --purge software-properties-common
sudo apt-get -y autoremove
- name: Install secp256k1
uses: input-output-hk/setup-secp256k1@v1
with:
git-ref: ${{ env.SECP256K1_REF }}
cache-version: ${{ env.SECP_CACHE_VERSION }}

- name: Cabal update
run: cabal update

- name: combine github-pages, and machine local project files.
run: |
cat .github/workflows/cabal.project.local.github-pages \
".github/workflows/cabal.project.local.ci.$(uname -s)" \
.github/workflows/cabal.project.local.ci \
| tee cabal.project.local
- name: Dry run
Expand Down
21 changes: 4 additions & 17 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,13 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.2.7", "9.6.2"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8", "9.6.3"]
cabal: ["3.10.2.0"]
os: [macos-latest, windows-latest, ubuntu-latest]

env:
# Modify this value to "invalidate" the cabal cache.
CABAL_CACHE_VERSION: "2023-10-04"

# Modify this value to "invalidate" the secp cache.
SECP_CACHE_VERSION: "2022-12-30"

# current ref from: 27.02.2022
SECP256K1_REF: ac83be33d0956faf6b7f61a60ab524ef7d6a473a
CABAL_CACHE_VERSION: "2023-11-20"

concurrency:
group: >
Expand Down Expand Up @@ -82,7 +76,7 @@ jobs:
- name: Configure build
shell: bash
run: |
cp ".github/workflows/cabal.project.local.ci.$(uname -s)" cabal.project.local
cp .github/workflows/cabal.project.local.ci cabal.project.local
echo "# cabal.project.local"
cat cabal.project.local
Expand Down Expand Up @@ -178,13 +172,6 @@ jobs:
fi
done
- name: Save Artifact
if: matrix.ghc == '8.10.7'
uses: actions/upload-artifact@v1
with:
name: artifacts-${{ matrix.os }}
path: ./artifacts

- name: Delete socket files in chairman tests in preparation for uploading artifacts
if: ${{ always() }}
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion cardano-node-capi/cardano-node-capi.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ maintainer: [email protected]
license: Apache-2.0
license-files: LICENSE
NOTICE
extra-source-files: CHANGELOG.md
extra-doc-files: CHANGELOG.md

common project-config
default-language: Haskell2010
Expand Down
2 changes: 1 addition & 1 deletion cardano-node/cardano-node.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license: Apache-2.0
license-files: LICENSE
NOTICE
build-type: Simple
extra-source-files: ChangeLog.md
extra-doc-files: ChangeLog.md

Flag unexpected_thunks
Description: Turn on unexpected thunks checks
Expand Down
2 changes: 1 addition & 1 deletion cardano-submit-api/cardano-submit-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ maintainer: [email protected]
category: Cardano,
Web,
build-type: Simple
extra-source-files: CHANGELOG.md
extra-doc-files: CHANGELOG.md

common project-config
default-language: Haskell2010
Expand Down
2 changes: 1 addition & 1 deletion cardano-testnet/cardano-testnet.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license: Apache-2.0
license-files: LICENSE
NOTICE
build-type: Simple

extra-doc-files: CHANGELOG.md

common project-config
default-language: Haskell2010
Expand Down

0 comments on commit 0b239f4

Please sign in to comment.