From eb423514a9eb3e8fd35e91fbc335576ff9e1cb5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9cate=20Kleidukos?= Date: Sun, 21 Jul 2024 12:16:22 +0200 Subject: [PATCH] Fix Install step --- .github/workflows/ci.yml | 5 ++++- .github/workflows/release.yml | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6543370..0dfd2e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,10 @@ jobs: run: cabal test --project-file=cabal.release.project all - name: Install - run: cabal install --project-file=cabal.release.project --installdir=distribution --install-method=copy + run: | + bin=$(cabal -v0 --project-file=cabal.static.project list-bin get-tested) + mkdir distribution + cp ${bin} distribution/get-tested - name: File type run: file distribution/get-tested diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a10bb5..55f8b6c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,7 +61,10 @@ jobs: run: cabal test --project-file=cabal.release.project all - name: Install - run: cabal install --project-file=cabal.release.project --installdir=distribution --install-method=copy + run: | + bin=$(cabal -v0 --project-file=cabal.static.project list-bin get-tested) + mkdir distribution + cp ${bin} distribution/get-tested - name: File type run: file distribution/get-tested @@ -74,7 +77,7 @@ jobs: FILE=$(basename $GETTESTED_EXEC) version=$(./distribution/get-tested --version) GETTESTED_EXEC_TAR=get-tested-${version}-${{ runner.os }}-${{ env.ARCH }}.tar.gz - tar -czvf $GETTESTED_EXEC_TAR -C $DIR distribution/get-tested + tar -czvf $GETTESTED_EXEC_TAR -C $DIR $FILE echo GETTESTED_EXEC_TAR=$GETTESTED_EXEC_TAR >> $GITHUB_ENV - name: Upload the get-tested executable uses: actions/upload-artifact@v3 @@ -144,7 +147,7 @@ jobs: FILE=$(basename $GETTESTED_EXEC) version=$(./distribution/get-tested --version) GETTESTED_EXEC_TAR=get-tested-${version}-${{ runner.os }}-static-${{ env.ARCH }}.tar.gz - tar -czvf $GETTESTED_EXEC_TAR -C $DIR distribution/get-tested + tar -czvf $GETTESTED_EXEC_TAR -C $DIR $FILE echo GETTESTED_EXEC_TAR=$GETTESTED_EXEC_TAR >> $GITHUB_ENV - name: Upload get-tested executable to workflow artifacts