Skip to content

Commit

Permalink
Merge branch 'main' into taztingo/1292-new-marker-supply
Browse files Browse the repository at this point in the history
  • Loading branch information
Taztingo authored Sep 14, 2023
2 parents a668837 + c121218 commit 47c0205
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ on:
- labeled
- unlabeled

permissions:
contents: write

jobs:
changelog:
runs-on: ubuntu-latest
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Docker Build and Push
# Build & Push builds the simapp docker image on every push to master
# and pushes the image to https://hub.docker.com/u/provenanceio
on:
pull_request:

push:
branches:
- main
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
- Bump `bufbuild/buf-setup-action` from 1.22.0 to 1.23.1 ([#1613](https://github.com/provenance-io/provenance/pull/1613))
- Bump `bufbuild/buf-setup-action` from 1.21.0 to 1.22.0 ([#1610](https://github.com/provenance-io/provenance/pull/1610))
- Bump `docker/setup-buildx-action` from 2 to 3 ([#1681](https://github.com/provenance-io/provenance/pull/1681))
- Bump `docker/login-action` from 2 to 3 ([#1680](https://github.com/provenance-io/provenance/pull/1680))

---

Expand Down

0 comments on commit 47c0205

Please sign in to comment.