Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop branch into master branch #281

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4daf324
Merge pull request #280 from bitshares/master
abitmore Mar 8, 2024
f25c24b
Merge pull request #282 from bitshares/master
abitmore Mar 8, 2024
747a1fb
Bump ejs from 3.1.9 to 3.1.10
dependabot[bot] May 2, 2024
0af46e7
Merge pull request #283 from bitshares/dependabot/npm_and_yarn/ejs-3.…
abitmore May 2, 2024
e3bba2d
Bump ws, engine.io and socket.io-adapter
dependabot[bot] Jun 19, 2024
9ac0ffd
Merge pull request #284 from bitshares/dependabot/npm_and_yarn/multi-…
abitmore Jun 19, 2024
751ec1d
Bump braces from 3.0.2 to 3.0.3
dependabot[bot] Jun 19, 2024
524c72e
Merge pull request #285 from bitshares/dependabot/npm_and_yarn/braces…
abitmore Jun 19, 2024
2a69135
Bump webpack from 5.89.0 to 5.94.0
dependabot[bot] Aug 31, 2024
637a80a
Merge pull request #286 from bitshares/dependabot/npm_and_yarn/webpac…
abitmore Aug 31, 2024
c297157
Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows
dependabot[bot] Sep 3, 2024
c7b977f
Update download-artifact to v4
abitmore Sep 4, 2024
bae20b5
Merge pull request #287 from bitshares/dependabot/github_actions/dot-…
abitmore Sep 4, 2024
2e2a9cf
Bump cookie and socket.io
dependabot[bot] Oct 11, 2024
9f45fc2
Merge pull request #288 from bitshares/dependabot/npm_and_yarn/multi-…
abitmore Oct 12, 2024
a83f369
Bump @intlify/shared and vue-i18n
dependabot[bot] Dec 2, 2024
3b6a3e2
Merge pull request #289 from bitshares/dependabot/npm_and_yarn/multi-…
abitmore Dec 3, 2024
266df7f
Bump nanoid from 3.3.7 to 3.3.8
dependabot[bot] Dec 14, 2024
1366f35
Merge pull request #291 from bitshares/dependabot/npm_and_yarn/nanoid…
abitmore Dec 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,32 +90,32 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download exe
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: BeetSetup.exe
path: ~/
- name: Download exe blockmap
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: BeetSetup.exe.blockmap
path: ~/
- name: Download latest yml
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: latest.yml
path: ~/
- name: Download dmg
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: BeetSetup.dmg
path: ~/
- name: Download deb
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: BeetSetup.deb
path: ~/
- name: Download AppImage
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: BeetSetup.AppImage
path: ~/
Expand Down Expand Up @@ -153,4 +153,4 @@ jobs:
|[EXE blockmap](https://github.com/bitshares/beet/releases/download/${{ github.ref_name }}/BeetSetup.exe.blockmap)|`${{steps.calc_hash.outputs.blockmaphash}}`|
|[Latest.yml](https://github.com/bitshares/beet/releases/download/${{ github.ref_name }}/latest.yml)|`${{steps.calc_hash.outputs.ymlhash}}`|
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Loading
Loading