From fc2b684592ead47e5efc476b53ac012d6ddfd669 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Wed, 5 Apr 2023 16:37:32 +0200 Subject: [PATCH 01/31] Release workflow#19 --- .github/workflows/release.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 042d2c18..dcff70f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,11 +6,18 @@ on: - "v*" permissions: - contents: read + contents: write jobs: - release: + build: uses: ./.github/workflows/haskell.yml - # TODO: Release workflow #19 (https://github.com/geniusyield/atlas/issues/19) - # - Download artifacts - # - Publish artifacts as GitHub Release + release: + - name: Release + run: | + echo "Atlas version: $ATLAS_VERSION" + # export GH_TOKEN=${{ secrets.GITHUB_TOKEN }} + # gh release create \ + # --generate-notes \ + # --verify-tag \ + # 'v1.0.0' \ + # './generated_docs/index.html#documentation' From 29eac3daa86d3b3b68a36a6555ec7c22fbf8006a Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Wed, 5 Apr 2023 16:39:38 +0200 Subject: [PATCH 02/31] Release workflow#19 --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dcff70f2..f29fa925 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,6 +12,7 @@ jobs: build: uses: ./.github/workflows/haskell.yml release: + steps: - name: Release run: | echo "Atlas version: $ATLAS_VERSION" From 487a29ffccb1bb5907f7bfe7dbdd2991b5acabc5 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Wed, 5 Apr 2023 16:40:48 +0200 Subject: [PATCH 03/31] Release workflow#19 --- .github/workflows/release.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f29fa925..5d15b37e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,13 +12,8 @@ jobs: build: uses: ./.github/workflows/haskell.yml release: - steps: - - name: Release - run: | - echo "Atlas version: $ATLAS_VERSION" - # export GH_TOKEN=${{ secrets.GITHUB_TOKEN }} - # gh release create \ - # --generate-notes \ - # --verify-tag \ - # 'v1.0.0' \ - # './generated_docs/index.html#documentation' + runs-on: ubuntu-22.04 + steps: + - name: Release + run: | + echo "Atlas version: $ATLAS_VERSION" From ac1a47033c9e425da480e8d6df86a5312123a52e Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Wed, 5 Apr 2023 16:43:45 +0200 Subject: [PATCH 04/31] Release workflow#19 --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d15b37e..6d4bd7f0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,5 +15,4 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Release - run: | - echo "Atlas version: $ATLAS_VERSION" + run: echo "$ATLAS_VERSION" From 5bb87e1e372a4712832002aca9ff9cfc824209b9 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Wed, 5 Apr 2023 16:54:05 +0200 Subject: [PATCH 05/31] Release workflow#19 --- .github/workflows/haskell.yml | 6 ++++-- .github/workflows/release.yml | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 021d4fa9..896d08aa 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -7,9 +7,9 @@ permissions: jobs: build: - runs-on: ubuntu-22.04 - + outputs: + ATLAS_VERSION: ${{ steps.get_atlas_version.outputs.ATLAS_VERSION }} steps: - name: Checkout source code uses: actions/checkout@v3 @@ -112,10 +112,12 @@ jobs: - name: Create source distribution file (cabal) run: cabal sdist - name: Identify atlas version (cabal) + id: get_atlas_version run: | export ATLAS_VERSION=$(cabal info . | awk '{print $2 ;exit}') ; echo "ATLAS_VERSION: $ATLAS_VERSION" echo "ATLAS_VERSION=${ATLAS_VERSION}" >> $GITHUB_ENV + echo "ATLAS_VERSION=${ATLAS_VERSION}" >> $GITHUB_OUTPUT - name: Generate documentation (cabal haddock) run: cabal haddock --html --hyperlink-source --haddock-options="--use-unicode" - name: Upload haddock documentation diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d4bd7f0..5c57cbe7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,9 @@ jobs: uses: ./.github/workflows/haskell.yml release: runs-on: ubuntu-22.04 + needs: build steps: - name: Release + env: + ATLAS_VERSION: ${{needs.build.outputs.build}} run: echo "$ATLAS_VERSION" From 326c41746e0a6af89b227769c788b02e1b96cc47 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Wed, 5 Apr 2023 17:22:34 +0200 Subject: [PATCH 06/31] Release workflow#19 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5c57cbe7..666034cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,4 +18,4 @@ jobs: - name: Release env: ATLAS_VERSION: ${{needs.build.outputs.build}} - run: echo "$ATLAS_VERSION" + run: echo "${{ env.ATLAS_VERSION }" From 1082eeb12f0f98f943fbc7efd7883e5949d8cd41 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Wed, 5 Apr 2023 17:44:34 +0200 Subject: [PATCH 07/31] Release workflow#19 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 666034cf..2643879a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,4 +18,4 @@ jobs: - name: Release env: ATLAS_VERSION: ${{needs.build.outputs.build}} - run: echo "${{ env.ATLAS_VERSION }" + run: echo "${{ env.ATLAS_VERSION }}" From 35dc34e913c8c937e2f53a995834a6bf57db639e Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Wed, 5 Apr 2023 23:54:02 +0200 Subject: [PATCH 08/31] Release workflow#19 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2643879a..7fb6eeb6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,5 +17,5 @@ jobs: steps: - name: Release env: - ATLAS_VERSION: ${{needs.build.outputs.build}} + ATLAS_VERSION: ${{needs.build.outputs.ATLAS_VERSION}} run: echo "${{ env.ATLAS_VERSION }}" From c2e258f080244a41b8532a78cacb4c854ae41ac0 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 00:21:27 +0200 Subject: [PATCH 09/31] Release workflow#19 --- .github/workflows/haskell.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 896d08aa..7cdc0d58 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -1,6 +1,11 @@ name: Haskell CI -on: workflow_call +on: + workflow_call: + outputs: + ATLAS_VERSION: + description: "ATLAS_VERSION" + value: ${{ jobs.build.outputs.ATLAS_VERSION }} permissions: contents: read From e5a18ae95dde2098b5d5c0b8d0f5e0af5f3172f7 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 09:56:57 +0200 Subject: [PATCH 10/31] Release workflow#19 --- .github/workflows/haskell.yml | 5 +++++ .github/workflows/release.yml | 28 ++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 7cdc0d58..dd487823 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -2,6 +2,11 @@ name: Haskell CI on: workflow_call: + inputs: + RELEASE: + description: 'True to create a release.' + required: true + type: boolean outputs: ATLAS_VERSION: description: "ATLAS_VERSION" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7fb6eeb6..a80ae4bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,6 @@ name: Release -on: - push: - tags: - - "v*" +on: workflow_dispatch permissions: contents: write @@ -15,7 +12,26 @@ jobs: runs-on: ubuntu-22.04 needs: build steps: - - name: Release + - uses: actions/download-artifact@v3 + with: + name: source-distribution-file + path: ./source-distribution-file.zip + - uses: actions/download-artifact@v3 + with: + name: github-pages + path: ./haddock.zip + - name: Release env: ATLAS_VERSION: ${{needs.build.outputs.ATLAS_VERSION}} - run: echo "${{ env.ATLAS_VERSION }}" + run: | + export GH_TOKEN=${{ secrets.GITHUB_TOKEN }} + echo "${{ env.ATLAS_VERSION }}" + SEMANTIC_VERSION=v${ATLAS_VERSION/#atlas-} + git tag ${SEMANTIC_VERSION} + git push origin ${SEMANTIC_VERSION} + gh release create \ + --generate-notes \ + --verify-tag \ + --draft \ + "{{ env.ATLAS_VERSION }}" \ + "./source-distribution-file.zip#atlas ./github-pages#haddock" From a3f0c8bf964205c04fb53c1d5651876bad2e08fb Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 09:59:32 +0200 Subject: [PATCH 11/31] Release workflow#19 --- .github/workflows/haskell.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index dd487823..7cdc0d58 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -2,11 +2,6 @@ name: Haskell CI on: workflow_call: - inputs: - RELEASE: - description: 'True to create a release.' - required: true - type: boolean outputs: ATLAS_VERSION: description: "ATLAS_VERSION" From e42decfc5c2c58f874f9c09753376487f292efbe Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 10:14:30 +0200 Subject: [PATCH 12/31] Release workflow#19 --- .github/workflows/release.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a80ae4bd..14b03470 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,9 @@ name: Release -on: workflow_dispatch +on: + push: + tags: + - "v*" permissions: contents: write @@ -27,8 +30,15 @@ jobs: export GH_TOKEN=${{ secrets.GITHUB_TOKEN }} echo "${{ env.ATLAS_VERSION }}" SEMANTIC_VERSION=v${ATLAS_VERSION/#atlas-} - git tag ${SEMANTIC_VERSION} - git push origin ${SEMANTIC_VERSION} + TAGS=git describe --tags + echo "SEMANTIC_VERSION: $SEMANTIC_VERSION" + echo "TAGS: $TAGS" + if [[ "${TAGS}" == "${SEMANTIC_VERSION}" ]]; then + echo " [OK] The expected semantic version is present in the tags." + else + echo " [ERROR] The expected semantic version is missing in the tags." + exit 1 + fi gh release create \ --generate-notes \ --verify-tag \ From 86f6746679e6aed1463765057464ff2a1bd74167 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 10:26:28 +0200 Subject: [PATCH 13/31] Release workflow#19 --- .github/workflows/release.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14b03470..1034de62 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,12 +33,7 @@ jobs: TAGS=git describe --tags echo "SEMANTIC_VERSION: $SEMANTIC_VERSION" echo "TAGS: $TAGS" - if [[ "${TAGS}" == "${SEMANTIC_VERSION}" ]]; then - echo " [OK] The expected semantic version is present in the tags." - else - echo " [ERROR] The expected semantic version is missing in the tags." - exit 1 - fi + set -x gh release create \ --generate-notes \ --verify-tag \ From e31bd199e6de2128d6f23bf4160cf9bffad65a65 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 10:53:35 +0200 Subject: [PATCH 14/31] Release workflow#19 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1034de62..3f401546 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: export GH_TOKEN=${{ secrets.GITHUB_TOKEN }} echo "${{ env.ATLAS_VERSION }}" SEMANTIC_VERSION=v${ATLAS_VERSION/#atlas-} - TAGS=git describe --tags + TAGS=$(git describe --tags) echo "SEMANTIC_VERSION: $SEMANTIC_VERSION" echo "TAGS: $TAGS" set -x From 52c38abca0508f859f416878665d293bd32de575 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 11:05:36 +0200 Subject: [PATCH 15/31] Release workflow#19 --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3f401546..bd481e9f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,6 +15,8 @@ jobs: runs-on: ubuntu-22.04 needs: build steps: + - name: Checkout source code + uses: actions/checkout@v3 - uses: actions/download-artifact@v3 with: name: source-distribution-file From 9f0b01dd13e89b09a3934414f167ecbcd03eeb4b Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 11:18:17 +0200 Subject: [PATCH 16/31] Release workflow#19 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd481e9f..db04a973 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,5 +40,5 @@ jobs: --generate-notes \ --verify-tag \ --draft \ - "{{ env.ATLAS_VERSION }}" \ + "{{ env.SEMANTIC_VERSION }}" \ "./source-distribution-file.zip#atlas ./github-pages#haddock" From d573a7db0f49d218e1316b3e55b3b4eca065390d Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 12:28:14 +0200 Subject: [PATCH 17/31] Release workflow#19 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db04a973..9df30f00 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,5 +40,5 @@ jobs: --generate-notes \ --verify-tag \ --draft \ - "{{ env.SEMANTIC_VERSION }}" \ + "${SEMANTIC_VERSION}" \ "./source-distribution-file.zip#atlas ./github-pages#haddock" From c4c1befe56d089e62a3e032ca332cce05aa61c8a Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 12:48:39 +0200 Subject: [PATCH 18/31] Release workflow#19 --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9df30f00..f665a55a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,3 +42,9 @@ jobs: --draft \ "${SEMANTIC_VERSION}" \ "./source-distribution-file.zip#atlas ./github-pages#haddock" + unzip source-distribution-file.zip + # Upload package candidate to hackage: + # cabal upload \ + # --username=${{ secrets.HACKAGE_USER }} \ + # --password-command=${{ secrets.HACKAGE_PASSWORD }} \ + # ./${{ env.ATLAS_VERSION }}.tar.gz \ No newline at end of file From f65c5efcfd55a3565a0c57aa37897301f4d31e38 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 13:02:02 +0200 Subject: [PATCH 19/31] Release workflow#19 --- .github/workflows/release.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f665a55a..6a7b0313 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,14 +18,16 @@ jobs: - name: Checkout source code uses: actions/checkout@v3 - uses: actions/download-artifact@v3 + name: Download source distribution file with: name: source-distribution-file - path: ./source-distribution-file.zip + path: ./ - uses: actions/download-artifact@v3 + name: Download haddock with: name: github-pages - path: ./haddock.zip - - name: Release + path: ./ + - name: Create release draft (GitHub) env: ATLAS_VERSION: ${{needs.build.outputs.ATLAS_VERSION}} run: | @@ -42,7 +44,7 @@ jobs: --draft \ "${SEMANTIC_VERSION}" \ "./source-distribution-file.zip#atlas ./github-pages#haddock" - unzip source-distribution-file.zip + #unzip source-distribution-file.zip # Upload package candidate to hackage: # cabal upload \ # --username=${{ secrets.HACKAGE_USER }} \ From a70a09f76e8970c8b687930d62040354abd2ce01 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 13:17:16 +0200 Subject: [PATCH 20/31] Release workflow#19 --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a7b0313..4f0d7f35 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,12 +38,14 @@ jobs: echo "SEMANTIC_VERSION: $SEMANTIC_VERSION" echo "TAGS: $TAGS" set -x + mv ./atlas ./atlas.zip + mv ./github-pages ./haddock.zip gh release create \ --generate-notes \ --verify-tag \ --draft \ "${SEMANTIC_VERSION}" \ - "./source-distribution-file.zip#atlas ./github-pages#haddock" + "./atlas.zip#atlas ./haddock.zip#haddock" #unzip source-distribution-file.zip # Upload package candidate to hackage: # cabal upload \ From bf6473dc9e4fe3c25f53de6381fb680c9d510a89 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 13:46:20 +0200 Subject: [PATCH 21/31] Release workflow#19 --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4f0d7f35..9255cb4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,6 +38,8 @@ jobs: echo "SEMANTIC_VERSION: $SEMANTIC_VERSION" echo "TAGS: $TAGS" set -x + pwd + tree -L 3 mv ./atlas ./atlas.zip mv ./github-pages ./haddock.zip gh release create \ From 229fe9cc12040b9f61018a53ce1a9857491d0aad Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 14:10:11 +0200 Subject: [PATCH 22/31] Release workflow#19 --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9255cb4e..5163d5a7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,14 +40,12 @@ jobs: set -x pwd tree -L 3 - mv ./atlas ./atlas.zip - mv ./github-pages ./haddock.zip gh release create \ --generate-notes \ --verify-tag \ --draft \ "${SEMANTIC_VERSION}" \ - "./atlas.zip#atlas ./haddock.zip#haddock" + "./${{ env.ATLAS_VERSION }}.tar.gz#atlas" #unzip source-distribution-file.zip # Upload package candidate to hackage: # cabal upload \ From 090914c0d1af3966bb10b96e6d4b549857613ae9 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 15:15:41 +0200 Subject: [PATCH 23/31] Release workflow#19 --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5163d5a7..3407d3d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,6 +46,7 @@ jobs: --draft \ "${SEMANTIC_VERSION}" \ "./${{ env.ATLAS_VERSION }}.tar.gz#atlas" + echo "::notice::Succesfully created release draft ${SEMANTIC_VERSION}." #unzip source-distribution-file.zip # Upload package candidate to hackage: # cabal upload \ From 48dd95b5bf78001aa955a440a7b9138856fc67b6 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 15:29:47 +0200 Subject: [PATCH 24/31] Release workflow#19 --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3407d3d3..a37568eb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,12 +21,12 @@ jobs: name: Download source distribution file with: name: source-distribution-file - path: ./ + path: ./artifacts - uses: actions/download-artifact@v3 name: Download haddock with: name: github-pages - path: ./ + path: ./artifacts - name: Create release draft (GitHub) env: ATLAS_VERSION: ${{needs.build.outputs.ATLAS_VERSION}} @@ -45,7 +45,7 @@ jobs: --verify-tag \ --draft \ "${SEMANTIC_VERSION}" \ - "./${{ env.ATLAS_VERSION }}.tar.gz#atlas" + "./artifacts/${{ env.ATLAS_VERSION }}.tar.gz#${{ env.ATLAS_VERSION }}" echo "::notice::Succesfully created release draft ${SEMANTIC_VERSION}." #unzip source-distribution-file.zip # Upload package candidate to hackage: From 23c1e619fd3c9e6f773576c3d4d3b8052606cb0c Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 16:06:00 +0200 Subject: [PATCH 25/31] Release workflow#19 --- .github/workflows/release.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a37568eb..a03d19d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,38 +18,27 @@ jobs: - name: Checkout source code uses: actions/checkout@v3 - uses: actions/download-artifact@v3 - name: Download source distribution file + name: Download source distribution file artifact with: name: source-distribution-file path: ./artifacts - - uses: actions/download-artifact@v3 - name: Download haddock - with: - name: github-pages - path: ./artifacts - name: Create release draft (GitHub) env: ATLAS_VERSION: ${{needs.build.outputs.ATLAS_VERSION}} run: | export GH_TOKEN=${{ secrets.GITHUB_TOKEN }} - echo "${{ env.ATLAS_VERSION }}" SEMANTIC_VERSION=v${ATLAS_VERSION/#atlas-} TAGS=$(git describe --tags) + GIT_REVISION=$(git rev-parse HEAD) + echo "ATLAS_VERSION: ${{ env.ATLAS_VERSION }}" echo "SEMANTIC_VERSION: $SEMANTIC_VERSION" echo "TAGS: $TAGS" + echo "GIT_REVISION: $GIT_REVISION" set -x - pwd - tree -L 3 gh release create \ --generate-notes \ --verify-tag \ --draft \ "${SEMANTIC_VERSION}" \ "./artifacts/${{ env.ATLAS_VERSION }}.tar.gz#${{ env.ATLAS_VERSION }}" - echo "::notice::Succesfully created release draft ${SEMANTIC_VERSION}." - #unzip source-distribution-file.zip - # Upload package candidate to hackage: - # cabal upload \ - # --username=${{ secrets.HACKAGE_USER }} \ - # --password-command=${{ secrets.HACKAGE_PASSWORD }} \ - # ./${{ env.ATLAS_VERSION }}.tar.gz \ No newline at end of file + echo "::notice::Succesfully created release draft ${SEMANTIC_VERSION}, built from ${GIT_REVISION}. (Uploaded: ${{ env.ATLAS_VERSION }}.tar.gz)" From 417c29afd18dae81fc2d3e71561dfbd966c2f9b6 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 16:22:26 +0200 Subject: [PATCH 26/31] Release workflow#19 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a03d19d8..c0ebc9a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,5 +40,5 @@ jobs: --verify-tag \ --draft \ "${SEMANTIC_VERSION}" \ - "./artifacts/${{ env.ATLAS_VERSION }}.tar.gz#${{ env.ATLAS_VERSION }}" + "./artifacts/atlas-${SEMANTIC_VERSION}.tar.gz#source%20distribution%20file%20(tar.gz))" echo "::notice::Succesfully created release draft ${SEMANTIC_VERSION}, built from ${GIT_REVISION}. (Uploaded: ${{ env.ATLAS_VERSION }}.tar.gz)" From 769cfcac31cd027575f6e6449205888cc42bec64 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 16:38:56 +0200 Subject: [PATCH 27/31] Release workflow#19 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0ebc9a5..612c1e9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,5 +40,5 @@ jobs: --verify-tag \ --draft \ "${SEMANTIC_VERSION}" \ - "./artifacts/atlas-${SEMANTIC_VERSION}.tar.gz#source%20distribution%20file%20(tar.gz))" + "./artifacts/${{ env.ATLAS_VERSION }}.tar.gz#source%20distribution%20file%20(tar.gz))" echo "::notice::Succesfully created release draft ${SEMANTIC_VERSION}, built from ${GIT_REVISION}. (Uploaded: ${{ env.ATLAS_VERSION }}.tar.gz)" From 2bc6d908b68b1b93562a32530a0b76fd8a0e5c55 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 17:12:57 +0200 Subject: [PATCH 28/31] Release workflow#19 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 612c1e9c..e6e4c5b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,5 +40,5 @@ jobs: --verify-tag \ --draft \ "${SEMANTIC_VERSION}" \ - "./artifacts/${{ env.ATLAS_VERSION }}.tar.gz#source%20distribution%20file%20(tar.gz))" + "./artifacts/${{ env.ATLAS_VERSION }}.tar.gz#Source distribution file (tar.gz)" echo "::notice::Succesfully created release draft ${SEMANTIC_VERSION}, built from ${GIT_REVISION}. (Uploaded: ${{ env.ATLAS_VERSION }}.tar.gz)" From 398dcb8a0b914ab6d47c5253c805d04d3d0afb49 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 17:40:21 +0200 Subject: [PATCH 29/31] Release workflow#19 --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e6e4c5b3..76515852 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,10 +30,12 @@ jobs: SEMANTIC_VERSION=v${ATLAS_VERSION/#atlas-} TAGS=$(git describe --tags) GIT_REVISION=$(git rev-parse HEAD) + CI_BUILD_TIME=$(date --iso-8601=seconds --utc) echo "ATLAS_VERSION: ${{ env.ATLAS_VERSION }}" echo "SEMANTIC_VERSION: $SEMANTIC_VERSION" echo "TAGS: $TAGS" echo "GIT_REVISION: $GIT_REVISION" + echo "CI_BUILD_TIME: $CI_BUILD_TIME" set -x gh release create \ --generate-notes \ @@ -41,4 +43,4 @@ jobs: --draft \ "${SEMANTIC_VERSION}" \ "./artifacts/${{ env.ATLAS_VERSION }}.tar.gz#Source distribution file (tar.gz)" - echo "::notice::Succesfully created release draft ${SEMANTIC_VERSION}, built from ${GIT_REVISION}. (Uploaded: ${{ env.ATLAS_VERSION }}.tar.gz)" + echo "::notice::Succesfully created release draft ${SEMANTIC_VERSION} from ${GIT_REVISION}. (Uploaded: ${{ env.ATLAS_VERSION }}.tar.gz)" From 1c20d5ccb5bedd238469cd87335c2562ef29275f Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 18:00:21 +0200 Subject: [PATCH 30/31] Release workflow#19 --- .github/workflows/release.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76515852..43065e0b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,6 +22,11 @@ jobs: with: name: source-distribution-file path: ./artifacts + - uses: actions/download-artifact@v3 + name: Download haddock artifact + with: + name: github-pages + path: ./artifacts - name: Create release draft (GitHub) env: ATLAS_VERSION: ${{needs.build.outputs.ATLAS_VERSION}} @@ -36,11 +41,15 @@ jobs: echo "TAGS: $TAGS" echo "GIT_REVISION: $GIT_REVISION" echo "CI_BUILD_TIME: $CI_BUILD_TIME" + HADDOCK_FILE=${{ env.ATLAS_VERSION }}-haddock.tar set -x + mv ./artifacts/artifact.tar ./artifacts/${HADDOCK_FILE} gh release create \ --generate-notes \ --verify-tag \ --draft \ "${SEMANTIC_VERSION}" \ - "./artifacts/${{ env.ATLAS_VERSION }}.tar.gz#Source distribution file (tar.gz)" + "./artifacts/${{ env.ATLAS_VERSION }}.tar.gz#Source distribution file (tar.gz)" \ + "${HADDOCK_FILE}#Haddock (tar)" echo "::notice::Succesfully created release draft ${SEMANTIC_VERSION} from ${GIT_REVISION}. (Uploaded: ${{ env.ATLAS_VERSION }}.tar.gz)" + \ No newline at end of file From f4e3cbe03b31903fb72692dbb52233f515340206 Mon Sep 17 00:00:00 2001 From: 4TT1L4 <2914096+4TT1L4@users.noreply.github.com> Date: Thu, 6 Apr 2023 18:01:06 +0200 Subject: [PATCH 31/31] Release workflow#19 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43065e0b..e246a91b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,6 +50,6 @@ jobs: --draft \ "${SEMANTIC_VERSION}" \ "./artifacts/${{ env.ATLAS_VERSION }}.tar.gz#Source distribution file (tar.gz)" \ - "${HADDOCK_FILE}#Haddock (tar)" + "./artifacts/${HADDOCK_FILE}#Haddock (tar)" echo "::notice::Succesfully created release draft ${SEMANTIC_VERSION} from ${GIT_REVISION}. (Uploaded: ${{ env.ATLAS_VERSION }}.tar.gz)" \ No newline at end of file