Merge pull request #23 from brandonchinn178/ci

Update CI + release 0.2.0.0

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
       STACK_YAML: ${{ matrix.stack_yaml }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install toml-test
         env:
@@ -62,7 +62,7 @@ jobs:
     env:
       FOURMOLU_VERSION: '0.7.0.1'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install fourmolu
         run: |
@@ -76,13 +76,18 @@ jobs:
   check_sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: ~/.stack
           key: ${{ runner.os }}-check_sdist-${{ hashFiles('stack.yaml') }}
+
+      - name: Strip unreleased section from CHANGELOG
+        run: sed -i -n '/^## Unreleased/d; /^## /,$p' CHANGELOG.md
+
       - name: Create sdist bundle
         run: stack sdist --test-tarball --tar-dir .
+
       - uses: actions/upload-artifact@v3
         with:
           name: toml-reader-sdist

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
       - ci
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: main
 
@@ -20,23 +20,36 @@ jobs:
           name: toml-reader-sdist
           path: ./sdist/
 
-      - name: Load package version
-        run: scripts/GetVersion.hs
-        id: version_info
+      - uses: brandonchinn178/haskell-actions/parse-cabal-file@parse-cabal-file
+        id: cabal_file
+        with:
+          cabal_file: toml-reader.cabal
+      - name: Set version label
+        run: echo 'VERSION=v${{ steps.cabal_file.outputs.version }}' >> "${GITHUB_ENV}"
 
       - name: Load Hackage token secret name
-        run: |
-          import re
-          username = "${{ github.actor }}"
-          secret_name = "HACKAGE_TOKEN_" + re.sub(r"\W+", "_", username).upper()
-          print(f"::set-output name=secret_name::{secret_name}")
-        shell: python
         id: hackage_token_secret
+        run: |
+          USERNAME="$(echo "${GITHUB_ACTOR}" | tr '[:lower:]' '[:upper:]' | tr '-' '_')"
+          echo "name=HACKAGE_TOKEN_${USERNAME}" >> "${GITHUB_OUTPUT}"
+
+      - name: Get CHANGELOG section
+        run: |
+          sed '/^## Unreleased/,/^$/d' CHANGELOG.md > /tmp/changelog-without-unreleased
+          if [[ "$(head -n 1 /tmp/changelog-without-unreleased)" != "## ${VERSION}" ]]; then
+            echo "CHANGELOG doesn't look updated" >&2
+            exit 1
+          fi
+          sed '1 d; /^## v/,$ d' /tmp/changelog-without-unreleased > /tmp/changelog-body
+
+      - uses: brandonchinn178/haskell-actions/hackage-upload@hackage-upload
+        with:
+          archive: sdist/toml-reader-*.tar.gz
+          token: ${{ secrets[steps.hackage_token_secret.outputs.name] }}
 
-      - name: Make release
-        run: scripts/make-release.sh
-        env:
-          gh_token: ${{ secrets.GITHUB_TOKEN }}
-          hackage_token: ${{ secrets[steps.hackage_token_secret.outputs.secret_name] }}
-          version: ${{ steps.version_info.outputs.version }}
-          sdistdir: ./sdist/
+      - uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ env.VERSION }}
+          body_path: /tmp/changelog-body
+          draft: true
+          target_commitish: ${{ github.sha }}

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Unreleased
 
+## v0.2.0.0
+
 * Add getFieldOr [#10](https://github.com/brandonchinn178/toml-reader/issues/10)
 * Handle extremely large float values [#8](https://github.com/brandonchinn178/toml-reader/issues/8)
 * Add Exception instance for TOMLError

package.yaml

@@ -1,5 +1,5 @@
 name: toml-reader
-version: 0.1.0.0
+version: 0.2.0.0
 category: TOML, Text, Configuration
 synopsis: TOML format parser compliant with v1.0.0.
 description: TOML format parser compliant with v1.0.0. See README.md for more details.

toml-reader.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           toml-reader
-version:        0.1.0.0
+version:        0.2.0.0
 synopsis:       TOML format parser compliant with v1.0.0.
 description:    TOML format parser compliant with v1.0.0. See README.md for more details.
 category:       TOML, Text, Configuration