From 9b11300d23638f257543f90406b7ade6fd5118cb Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Thu, 25 Jul 2024 12:35:28 +0200 Subject: [PATCH] Pass sdist output to the upload command --- .gitea/deploy.awk | 3 +++ .gitea/workflows/build.yml | 27 ++++----------------------- .gitea/workflows/release.yml | 10 ++-------- 3 files changed, 9 insertions(+), 31 deletions(-) create mode 100644 .gitea/deploy.awk diff --git a/.gitea/deploy.awk b/.gitea/deploy.awk new file mode 100644 index 0000000..ed542f0 --- /dev/null +++ b/.gitea/deploy.awk @@ -0,0 +1,3 @@ +END { + system("cabal upload --username belka --password "ENVIRON["HACKAGE_PASSWORD"]" "$0) +} diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 3cb0475..ebb81c3 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -9,28 +9,14 @@ on: jobs: audit: - runs-on: haskell + runs-on: buildenv steps: - - name: Set up environment - run: | - apt-get update -y - apt-get upgrade -y - apt-get install -y nodejs pkg-config - uses: actions/checkout@v4 - - name: Install dependencies - run: | - cabal update - cabal install hlint "--constraint=hlint ==3.8" - - run: cabal exec hlint -- src tests + - run: hlint -- src tests test: - runs-on: haskell + runs-on: buildenv steps: - - name: Set up environment - run: | - apt-get update -y - apt-get upgrade -y - apt-get install -y nodejs pkg-config - uses: actions/checkout@v4 - name: Install dependencies run: cabal update @@ -39,13 +25,8 @@ jobs: - run: cabal test --test-show-details=streaming doc: - runs-on: haskell + runs-on: buildenv steps: - - name: Set up environment - run: | - apt-get update -y - apt-get upgrade -y - apt-get install -y nodejs pkg-config - uses: actions/checkout@v4 - name: Install dependencies run: cabal update diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index b815625..08e90c2 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -7,17 +7,11 @@ on: jobs: release: - runs-on: haskell + runs-on: buildenv steps: - - name: Set up environment - run: | - apt-get update -y - apt-get upgrade -y - apt-get install -y nodejs pkg-config - uses: actions/checkout@v4 - name: Upload a candidate env: HACKAGE_PASSWORD: ${{ secrets.HACKAGE_PASSWORD }} run: | - cabal sdist - cabal upload --username belka --password ${HACKAGE_PASSWORD} + cabal sdist | awk -f .gitea/deploy.awk