diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dec2380c..39935110 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macOS-latest, windows-latest] + os: [ubuntu-20.04, macOS-13, macOS-14, windows-latest] steps: - name: Check out code @@ -56,6 +56,8 @@ jobs: run: | if [ "$RUNNER_OS" == "Windows" ]; then newEXE="trident-$RUNNER_OS.exe" + elif [ "$RUNNER_OS" == "macOS" ]; then + newEXE="trident-$RUNNER_OS-$RUNNER_ARCH" else newEXE="trident-$RUNNER_OS" fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 528184e7..1a2ec174 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- V 1.5.0.1: Changed the release pipeline: `trident-macOS` was replaced by `trident-macOS-X64` and `trident-macOS-ARM64`. - V 1.5.0.0 - Removed Josiah Carberry from `newPackageTemplate`, so that he doesn't get added any more to new packages created by `init` and `forge` - the contributor field is missing in the output of these commands now. - Adjusted the golden test output accordingly, but also added Josiah to one of the test packages (`test/testDat/testPackages/ancient/Schiffels_2016`) to keep him around at least in one way and make sure that the ORCID parser runs in the tests. diff --git a/CHANGELOGRELEASE.md b/CHANGELOGRELEASE.md index a0fafe96..fa0091ec 100644 --- a/CHANGELOGRELEASE.md +++ b/CHANGELOGRELEASE.md @@ -1,3 +1,13 @@ +### V 1.5.0.1 + +This very minor release only affects the static `trident` executables produced for every release. + +It introduces a distinction between pre-built `X64` and `ARM64` executables for macOS, where changes in the main processor architecture have recently rendered old builds invalid for new systems and vice versa. + +That means the executable `trident-macOS` will henceforward not longer exist, but instead the executables `trident-macOS-X64` and `trident-macOS-ARM64`. + +In the past we have not explicitly documented changes in the compilation pipeline - v1.5.0.0, for example, came with a major overhaul of the pipeline - but in this case a small version bump seems to be in order to announce the split in available artefacts. + ### V 1.5.0.0 This is a minor, but technically breaking release. It removes the example contributor *Josiah Carberry* from new packages created by `trident init` and `trident forge` diff --git a/poseidon-hs.cabal b/poseidon-hs.cabal index 9b0970ea..3db9ae78 100644 --- a/poseidon-hs.cabal +++ b/poseidon-hs.cabal @@ -1,5 +1,5 @@ name: poseidon-hs -version: 1.5.0.0 +version: 1.5.0.1 synopsis: A package with tools for working with Poseidon Genotype Data description: The tools in this package read and analyse Poseidon-formatted genotype databases, a modular system for storing genotype data from thousands of individuals. license: MIT