Skip to content

Commit

Permalink
Merge branch 'master' of github.com:charukiewicz/hs-isbn
Browse files Browse the repository at this point in the history
  • Loading branch information
charukiewicz committed Dec 26, 2023
2 parents c274dc3 + f8bb8ff commit 404112e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ jobs:
- os: macOS-latest
ghc: 'latest'
steps:
- uses: actions/checkout@v3
- uses: haskell/actions/setup@v2.0.0
- uses: actions/checkout@v4
- uses: haskell/actions/setup@v2.4.7
id: setup-haskell-cabal
with:
ghc-version: ${{ matrix.ghc }}
- name: Update cabal package database
run: cabal update
- name: Install hspec-discover
run: cabal install hspec-discover
- uses: actions/cache@v3.0.7
- uses: actions/cache@v3.3.2
name: Cache cabal output
with:
path: |
Expand All @@ -53,7 +53,7 @@ jobs:
# # See: https://github.com/vmactions/freebsd-vm#under-the-hood.
# runs-on: macos-latest
# steps:
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
# - name: Test
# id: build-freebsd
# uses: vmactions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Revision history for `isbn`

## 1.1.0.5 - Dec 26, 2023
## 1.1.0.5 - December 26, 2023

- Bump version of `text` dependency to include versions up to 2.2 (exclusive)
- Add `flake.nix` file for Nix Flake-based development (via `nix develop`)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ hackage-upload: hackage-build ## Upload package candidate to hackage
@cabal upload -d $(BUILD_DIR)/docs/isbn-*-docs.tar.gz
@echo "Done!"

hackage-upload-publish: $(BUILD_DIR) ## Upload package candidate to hackage
hackage-upload-publish: $(BUILD_DIR) ## Upload package to hackage (published)
@cabal upload --publish $(BUILD_DIR)/sdist/isbn-*.tar.gz
@cabal upload --publish -d $(BUILD_DIR)/docs/isbn-*-docs.tar.gz
@echo "Done!"
Expand Down

0 comments on commit 404112e

Please sign in to comment.