Skip to content

Commit a8ef964

Browse files
pbrisbinpbrisbin
authored
Merge branch 'main' into dependabot/github_actions/actions/checkout-4
2 parents 0bb1659 + 0c26d0f commit a8ef964

11 files changed

Lines changed: 89 additions & 79 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @freckle/backenders

‎.github/dependabot.yml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.github/workflows/add-asana-comment.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Asana
2+
3+
on:
4+
pull_request:
5+
types: [opened]
6+
7+
jobs:
8+
link-asana-task:
9+
if: ${{ github.actor != 'dependabot[bot]' }}
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: Asana/create-app-attachment-github-action@v1.3
13+
id: postAttachment
14+
with:
15+
asana-secret: ${{ secrets.ASANA_API_ACCESS_KEY }}
16+
- run: echo "Status is ${{ steps.postAttachment.outputs.status }}"

‎.github/workflows/ci.yml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,39 @@ name: CI
22

33
on:
44
pull_request:
5-
push:
6-
branches: main
75

86
jobs:
7+
generate:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v4
11+
- id: generate
12+
uses: freckle/stack-action/generate-matrix@v5
13+
outputs:
14+
stack-yamls: ${{ steps.generate.outputs.stack-yamls }}
15+
fail-fast: false
16+
917
test:
18+
needs: generate
1019
runs-on: ubuntu-latest
1120

1221
strategy:
1322
matrix:
14-
stack-yaml:
15-
- stack-nightly.yaml # ghc-9.6
16-
- stack.yaml # ghc-9.4
17-
- stack-lts-20.26.yaml # ghc-9.2
18-
- stack-lts-19.33.yaml # ghc-9.0
19-
- stack-lts-18.28.yaml # ghc-8.10
20-
- stack-lts-16.31.yaml # ghc-8.8
21-
- stack-lts-14.27.yaml # ghc-8.6
22-
- stack-lts-12.26.yaml # ghc-8.4
23-
- stack-persistent-2.14.yaml
23+
stack-yaml: ${{ fromJSON(needs.generate.outputs.stack-yamls) }}
2424
fail-fast: false
2525

2626
steps:
2727
- uses: actions/checkout@v4
28-
- uses: freckle/stack-action@v4
28+
- uses: freckle/stack-action@v5
2929
with:
3030
stack-yaml: ${{ matrix.stack-yaml }}
3131

3232
lint:
3333
runs-on: ubuntu-latest
3434
steps:
3535
- uses: actions/checkout@v4
36-
- uses: rwe/actions-hlint-setup@v1
37-
- uses: rwe/actions-hlint-run@v2
36+
37+
- uses: haskell-actions/hlint-setup@v2
38+
- uses: haskell-actions/hlint-run@v2
3839
with:
3940
fail-on: warning

‎.github/workflows/release.yml‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,31 @@ name: Release
22

33
on:
44
push:
5-
branches: main
5+
branches:
6+
- main
7+
- rc/*
68

79
jobs:
810
release:
911
runs-on: ubuntu-latest
1012
steps:
1113
- uses: actions/checkout@v4
14+
with:
15+
persist-credentials: false
1216

13-
- id: tag
14-
uses: freckle/haskell-tag-action@v1
15-
env:
16-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17+
- id: token
18+
uses: actions/create-github-app-token@v2
19+
with:
20+
app-id: ${{ vars.FRECKLE_AUTOMATION_APP_ID }}
21+
private-key: ${{ secrets.FRECKLE_AUTOMATION_PRIVATE_KEY }}
1722

18-
- if: steps.tag.outputs.tag
19-
uses: freckle/stack-upload-action@v2
23+
- id: release
24+
uses: cycjimmy/semantic-release-action@v4
2025
with:
21-
pvp-bounds: lower
26+
extra_plugins: |
27+
semantic-release-stack-upload
2228
env:
23-
HACKAGE_API_KEY: ${{ secrets.HACKAGE_UPLOAD_API_KEY }}
29+
FORCE_COLOR: 1
30+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
31+
HACKAGE_KEY: ${{ secrets.HACKAGE_UPLOAD_API_KEY }}
32+
STACK_YAML: stack-lts-12.26.yaml

‎.releaserc.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
tagFormat: "v2.${version}" # PVP prefixed
2+
3+
plugins:
4+
- "@semantic-release/commit-analyzer"
5+
- "@semantic-release/release-notes-generator"
6+
- - "@semantic-release/github"
7+
- successCommentCondition: false
8+
- - "semantic-release-stack-upload"
9+
- pvpBounds: lower
10+
stripSuffix: true
11+
12+
branches:
13+
- main
14+
- name: rc/*
15+
prerelease: '${name.replace(/^rc\//, "rc-")}'

‎CHANGELOG.md‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1 @@
1-
## [_Unreleased_](https://github.com/freckle/graphula/compare/v2.1.0.0...main)
2-
3-
## [v2.1.0.0](https://github.com/freckle/graphula/compare/v2.0.2.2...v2.1.0.0)
4-
5-
- Some unnecessary `SafeToInsert` have been removed from `node` and `nodeKeyed`.
6-
- `node` only requires `SafeToInsert` when the `KeySource` is `SourceDefault`,
7-
not when the `KeySource` is `KeyArbitrary`.
8-
- `nodeKeyed` no longer ever requires `SafeToInsert`
9-
- `MonadGraphulaFrontend` has a new `insertKeyed` method.
10-
11-
## [v2.0.2.2](https://github.com/freckle/graphula/compare/v2.0.2.1...v2.0.2.2)
12-
13-
- Add missing MonadUnliftIO instance to GraphulaLoggedT
14-
15-
## [v2.0.2.1](https://github.com/freckle/graphula/compare/v2.0.1.1...v2.0.2.1)
16-
17-
- Support persistent-2.14
18-
19-
## [v2.0.1.1](https://github.com/freckle/graphula/compare/v2.0.0.5...v2.0.1.1)
20-
21-
- Support GHCs 9.0 and 9.2
22-
23-
## [v2.0.1.0](https://github.com/freckle/graphula/compare/v2.0.0.5...v2.0.1.0)
24-
25-
- Add/improve documentation
26-
- Re-organize previously-internal module
27-
28-
## [v2.0.0.5](https://github.com/freckle/graphula/compare/v2.0.0.4...v2.0.0.5)
29-
30-
- Release without dependencies upper bounds
31-
32-
## [v2.0.0.4](https://github.com/freckle/graphula/compare/v2.0.0.3...v2.0.0.4)
33-
34-
- Relax persistent packages' upper bounds
35-
36-
## [v2.0.0.3](https://github.com/freckle/graphula/compare/v2.0.0.2...v2.0.0.3)
37-
38-
- Relax dependencies upper bounds
39-
40-
## [v2.0.0.2](https://github.com/freckle/graphula/compare/v2.0.0.1...v2.0.0.2)
41-
42-
- Support GHC-8.10 and unliftio-core 2.0.0
43-
44-
## [v2.0.0.1](https://github.com/faktory/graphula/tree/v2.0.0.1)
45-
46-
First tagged release.
1+
See https://github.com/freckle/graphula/releases

‎graphula.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.36.0.
3+
-- This file has been generated from package.yaml by hpack version 0.37.0.
44
--
55
-- see: https://github.com/sol/hpack
66

77
name: graphula
8-
version: 2.1.0.0
8+
version: 2.0.0.0
99
synopsis: A simple interface for generating persistent data and linking its dependencies
1010
description: Please see README.md
1111
category: Network

‎package.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: graphula
2-
version: 2.1.0.0
2+
version: 2.0.0.0
33
maintainer: Freckle Education
44
category: Network
55
github: freckle/graphula

‎renovate.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"local>freckle/renovate-config"
5+
],
6+
"minimumReleaseAge": "0 days"
7+
}

0 commit comments

Comments
 (0)