Skip to content

Commit

Permalink
Merge branch 'Greenstand:v2' into v2
Browse files Browse the repository at this point in the history
  • Loading branch information
samwel141 authored Oct 22, 2024
2 parents fb2e0e3 + e29db7c commit 84d075a
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
if: github.event_name == 'push' && github.repository == ${{ env.repository }}
run: npm run build:dev
working-directory: ${{ env.project-directory }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
if: github.event_name == 'push' && github.repository == ${{ env.repository }}
with:
name: client-bundle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
if: "contains(github.event.inputs.env, 'dev')"
run: npm run build:dev
working-directory: ${{ env.project-directory }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: frontend-bundle
path: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/treetracker-wallet-admin-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.event_name == 'push' && github.repository == 'Greenstand/treetracker-wallet-admin-client'
run: npm run build:dev
working-directory: ${{ env.project-directory }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
if: github.event_name == 'push' && github.repository == 'Greenstand/treetracker-wallet-admin-client'
with:
name: client-bundle
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [2.1.0-v2.15](https://github.com/Greenstand/treetracker-wallet-admin-client/compare/v2.1.0-v2.14...v2.1.0-v2.15) (2024-10-22)


### Bug Fixes

* upgrade actions/upload-artifact to v4 ([c4c8564](https://github.com/Greenstand/treetracker-wallet-admin-client/commit/c4c8564b16b26a86da1ee88290833964382815e6))

# [2.1.0-v2.14](https://github.com/Greenstand/treetracker-wallet-admin-client/compare/v2.1.0-v2.13...v2.1.0-v2.14) (2024-09-08)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "treetracker-wallet-admin-client",
"version": "2.1.0-v2.14",
"version": "2.1.0-v2.15",
"private": true,
"dependencies": {
"@emotion/react": "^11.10.6",
Expand Down

0 comments on commit 84d075a

Please sign in to comment.