From cf7e6dc4081b965463dedbb74f660411589c13fc Mon Sep 17 00:00:00 2001 From: Stephan Schiffels Date: Wed, 26 Mar 2025 18:47:36 +0100 Subject: [PATCH 01/10] added linux-arm build --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 23c0ee2..d2da920 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -27,7 +27,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macOS-13, macOS-14, windows-latest] + os: [ubuntu-20.04, ubuntu-22.04-arm, macOS-13, macOS-14, windows-latest] steps: - name: Check out code From 8fc6f47f2b6c09d9cabd683c8bec56aa1d1101e4 Mon Sep 17 00:00:00 2001 From: Stephan Schiffels Date: Wed, 26 Mar 2025 18:57:13 +0100 Subject: [PATCH 02/10] added workflow_dispatch to run workflow manually --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d2da920..de42994 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,6 +5,7 @@ on: push: tags: - "v*" + workflow_dispatch: jobs: create_release: From b31d7af3a48b2fdb2ba05762e49b7163e4f23fd0 Mon Sep 17 00:00:00 2001 From: Stephan Schiffels Date: Wed, 26 Mar 2025 19:18:28 +0100 Subject: [PATCH 03/10] fixed workflow --- .github/workflows/release.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index de42994..734ade5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -67,12 +67,6 @@ jobs: echo "BINARY_PATH=$newEXE" >> $GITHUB_OUTPUT shell: bash - - name: Compress binary - if: ${{ runner.os != 'macOS' }} # upx is crashing for macOS Ventura or above! - uses: svenstaro/upx-action@v2 - with: - files: ${{ steps.binarypath.outputs.BINARY_PATH }} - - name: Upload Release Asset id: upload-release-asset uses: ncipollo/release-action@v1 From 25376da41c67dd45293a694036b1884f304f41a9 Mon Sep 17 00:00:00 2001 From: Stephan Schiffels Date: Wed, 7 May 2025 08:00:41 +0200 Subject: [PATCH 04/10] tweaked workflow for linux-arm --- .github/workflows/release.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 734ade5..13c4b1a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -57,10 +57,8 @@ jobs: run: | if [ "$RUNNER_OS" == "Windows" ]; then newEXE="pileupCaller-$RUNNER_OS.exe" - elif [ "$RUNNER_OS" == "macOS" ]; then + else [ "$RUNNER_OS" == "macOS" ]; then newEXE="pileupCaller-$RUNNER_OS-$RUNNER_ARCH" - else - newEXE="pileupCaller-$RUNNER_OS" fi currentEXE="${{ steps.stack.outputs.local-bin }}/pileupCaller" mv $currentEXE $newEXE From 85b5a758b685aef036787d22ccce3a0b5a3af744 Mon Sep 17 00:00:00 2001 From: Stephan Schiffels Date: Wed, 7 May 2025 08:15:39 +0200 Subject: [PATCH 05/10] more workflow tweaks --- .github/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 13c4b1a..66f605a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -28,7 +28,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04-arm, macOS-13, macOS-14, windows-latest] + os: [ubuntu-latest, ubuntu-latest-arm, macOS-13, macOS-latest, windows-latest] steps: - name: Check out code @@ -57,7 +57,7 @@ jobs: run: | if [ "$RUNNER_OS" == "Windows" ]; then newEXE="pileupCaller-$RUNNER_OS.exe" - else [ "$RUNNER_OS" == "macOS" ]; then + else newEXE="pileupCaller-$RUNNER_OS-$RUNNER_ARCH" fi currentEXE="${{ steps.stack.outputs.local-bin }}/pileupCaller" From e9b595fab592bd9b7b17dbfe3a263aee11559cb9 Mon Sep 17 00:00:00 2001 From: Stephan Schiffels Date: Wed, 7 May 2025 08:50:49 +0200 Subject: [PATCH 06/10] tweaked dockerfile --- .github/workflows/Dockerfile.centos | 4 ++-- stack.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Dockerfile.centos b/.github/workflows/Dockerfile.centos index d2cb7c9..a92cf69 100644 --- a/.github/workflows/Dockerfile.centos +++ b/.github/workflows/Dockerfile.centos @@ -5,8 +5,8 @@ RUN yum -y install zlib-devel wget ncurses-devel ncurses-compat-libs make gcc gc # Install GHC since stack's local install has issues RUN wget https://downloads.haskell.org/~ghc/9.4.7/ghc-9.4.7-x86_64-centos7-linux.tar.xz -RUN tar xvf ghc-9.4.7-x86_64-centos7-linux.tar.xz -RUN cd ghc-9.4.7-x86_64-unknown-linux; ./configure; make install +RUN tar xvf ghc-9.6.6-x86_64-centos7-linux.tar.xz +RUN cd ghc-9.6.6-x86_64-unknown-linux; ./configure; make install # install stack RUN curl -sSL https://get.haskellstack.org/ | sh diff --git a/stack.yaml b/stack.yaml index f4eb74d..76464f1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,5 +2,5 @@ resolver: lts-22.43 packages: - '.' extra-deps: -- sequence-formats-1.11.0.0 +- sequence-formats-1.11.0.1 - pipes-zlib-0.4.4.2 \ No newline at end of file From 8fa0f19f0e181ff7edfd1afca9fc10f0d59a5a28 Mon Sep 17 00:00:00 2001 From: Stephan Schiffels Date: Wed, 7 May 2025 09:27:20 +0200 Subject: [PATCH 07/10] fixed dockerfile --- .github/workflows/Dockerfile.centos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dockerfile.centos b/.github/workflows/Dockerfile.centos index a92cf69..aa6ee66 100644 --- a/.github/workflows/Dockerfile.centos +++ b/.github/workflows/Dockerfile.centos @@ -4,7 +4,7 @@ RUN yum -y update RUN yum -y install zlib-devel wget ncurses-devel ncurses-compat-libs make gcc gcc-c++ # Install GHC since stack's local install has issues -RUN wget https://downloads.haskell.org/~ghc/9.4.7/ghc-9.4.7-x86_64-centos7-linux.tar.xz +RUN wget https://downloads.haskell.org/~ghc/9.4.7/ghc-9.6.6-x86_64-centos7-linux.tar.xz RUN tar xvf ghc-9.6.6-x86_64-centos7-linux.tar.xz RUN cd ghc-9.6.6-x86_64-unknown-linux; ./configure; make install From 95086e7fd7a5ab6648f57ba4bb12be53094ecead Mon Sep 17 00:00:00 2001 From: Stephan Schiffels Date: Fri, 9 May 2025 10:58:08 +0200 Subject: [PATCH 08/10] fixed Dockerfile --- .github/workflows/Dockerfile.centos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dockerfile.centos b/.github/workflows/Dockerfile.centos index aa6ee66..6335fb1 100644 --- a/.github/workflows/Dockerfile.centos +++ b/.github/workflows/Dockerfile.centos @@ -4,7 +4,7 @@ RUN yum -y update RUN yum -y install zlib-devel wget ncurses-devel ncurses-compat-libs make gcc gcc-c++ # Install GHC since stack's local install has issues -RUN wget https://downloads.haskell.org/~ghc/9.4.7/ghc-9.6.6-x86_64-centos7-linux.tar.xz +RUN wget https://downloads.haskell.org/~ghc/9.6.6/ghc-9.6.6-x86_64-centos7-linux.tar.xz RUN tar xvf ghc-9.6.6-x86_64-centos7-linux.tar.xz RUN cd ghc-9.6.6-x86_64-unknown-linux; ./configure; make install From 8e9c33c9e3271ab5aef32ce724c4864b3126ab26 Mon Sep 17 00:00:00 2001 From: Stephan Schiffels Date: Fri, 9 May 2025 11:05:38 +0200 Subject: [PATCH 09/10] removed Docker build for now --- .github/workflows/release.yaml | 54 +++++++++++++++++----------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 66f605a..8ba9160 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -76,30 +76,30 @@ jobs: artifacts: ${{ steps.binarypath.outputs.BINARY_PATH }} artifactContentType: application/octet-stream - build_centos_artifact: - needs: [create_release] - runs-on: ubuntu-latest - - steps: - - name: Checkout repo - uses: actions/checkout@v4 - - - name: Build Docker image - run: docker build -t linux -f .github/workflows/Dockerfile.centos . - - - name: Create container - run: docker create --name linuxcontainer linux - - - name: Copy executable - run: docker cp linuxcontainer:/root/.local/bin/pileupCaller pileupCaller-conda-linux - - - name: Upload Release Asset - id: upload-release-asset - uses: ncipollo/release-action@v1 - with: - name: Release ${{ github.ref_name }} - draft: true - allowUpdates: true - artifactErrorsFailBuild: true - artifacts: pileupCaller-conda-linux - artifactContentType: application/octet-stream \ No newline at end of file + # build_centos_artifact: + # needs: [create_release] + # runs-on: ubuntu-latest + + # steps: + # - name: Checkout repo + # uses: actions/checkout@v4 + + # - name: Build Docker image + # run: docker build -t linux -f .github/workflows/Dockerfile.centos . + + # - name: Create container + # run: docker create --name linuxcontainer linux + + # - name: Copy executable + # run: docker cp linuxcontainer:/root/.local/bin/pileupCaller pileupCaller-conda-linux + + # - name: Upload Release Asset + # id: upload-release-asset + # uses: ncipollo/release-action@v1 + # with: + # name: Release ${{ github.ref_name }} + # draft: true + # allowUpdates: true + # artifactErrorsFailBuild: true + # artifacts: pileupCaller-conda-linux + # artifactContentType: application/octet-stream \ No newline at end of file From 9890b6b4e94fc786beca586e8bc8a41f8a91f417 Mon Sep 17 00:00:00 2001 From: Stephan Schiffels Date: Mon, 3 Nov 2025 09:49:46 +0100 Subject: [PATCH 10/10] small tweaks --- .github/workflows/release.yaml | 56 +++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8ba9160..903b775 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -28,7 +28,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, ubuntu-latest-arm, macOS-13, macOS-latest, windows-latest] + os: [ubuntu-latest, ubuntu-latest-arm, macOS-latest, windows-latest] steps: - name: Check out code @@ -76,30 +76,30 @@ jobs: artifacts: ${{ steps.binarypath.outputs.BINARY_PATH }} artifactContentType: application/octet-stream - # build_centos_artifact: - # needs: [create_release] - # runs-on: ubuntu-latest - - # steps: - # - name: Checkout repo - # uses: actions/checkout@v4 - - # - name: Build Docker image - # run: docker build -t linux -f .github/workflows/Dockerfile.centos . - - # - name: Create container - # run: docker create --name linuxcontainer linux - - # - name: Copy executable - # run: docker cp linuxcontainer:/root/.local/bin/pileupCaller pileupCaller-conda-linux - - # - name: Upload Release Asset - # id: upload-release-asset - # uses: ncipollo/release-action@v1 - # with: - # name: Release ${{ github.ref_name }} - # draft: true - # allowUpdates: true - # artifactErrorsFailBuild: true - # artifacts: pileupCaller-conda-linux - # artifactContentType: application/octet-stream \ No newline at end of file + build_centos_artifact: + needs: [create_release] + runs-on: ubuntu-latest + + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - name: Build Docker image + run: docker build -t linux -f .github/workflows/Dockerfile.centos . + + - name: Create container + run: docker create --name linuxcontainer linux + + - name: Copy executable + run: docker cp linuxcontainer:/root/.local/bin/pileupCaller pileupCaller-conda-linux + + - name: Upload Release Asset + id: upload-release-asset + uses: ncipollo/release-action@v1 + with: + name: Release ${{ github.ref_name }} + draft: true + allowUpdates: true + artifactErrorsFailBuild: true + artifacts: pileupCaller-conda-linux + artifactContentType: application/octet-stream \ No newline at end of file