Skip to content

Commit

Permalink
Merge branch '2.0' into python/some-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Thoralf-M authored May 7, 2024
2 parents a1ccf33 + e62098b commit 0e21c21
Show file tree
Hide file tree
Showing 169 changed files with 4,484 additions and 2,727 deletions.
4 changes: 2 additions & 2 deletions .github/actions/ledger-nano/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runs:
uses: actions/checkout@v3
with:
repository: iotaledger/ledger-iota-app
ref: develop
ref: feat/nova
path: ledger-iota-app

- name: Update submodules
Expand All @@ -17,5 +17,5 @@ runs:

- name: Run the simulator
shell: bash
run: ./build.sh -s -v shimmer -b
run: ./build.sh -s -b
working-directory: ledger-iota-app
5 changes: 5 additions & 0 deletions .github/actions/private-tangle/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ runs:
go-version-file: "iota-core/go.mod"
cache: false

- name: Replace port 8084 by 8087 as it's already used by Mono
shell: bash
run: sed -i 's#8084#8087#g' docker-compose.yml
working-directory: iota-core/tools/docker-network

- name: Setup private tangle
shell: bash
# setup-go sets the PATH for the correct version, but sudo uses a different PATH by default
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/bindings-nodejs-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
shell: sh
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
run: yarn publish --access public
run: yarn publish --access public --tag alpha

nodejs-binding-prebuild:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -113,9 +113,14 @@ jobs:
run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV

- name: Install gon (macOS)
# Fork of https://github.com/mitchellh/gon
# https://github.com/Bearer/gon
# Since we're dealing with code signing secrets we want to pin the version of gon
if: ${{ startsWith(matrix.os, 'macos') }}
# https://github.com/mitchellh/gon
run: brew install mitchellh/gon/gon
run: |
wget https://raw.githubusercontent.com/Bearer/homebrew-tap/366bc999e14a8d04e07e24f9387bcbaf89c1bc53/Formula/gon.rb
brew install --formula gon.rb
rm gon.rb
- name: Set deployment target (macOS)
if: matrix.os == 'macos-13'
Expand Down Expand Up @@ -258,3 +263,4 @@ jobs:
body: https://github.com/iotaledger/iota-sdk/blob/develop/bindings/nodejs/CHANGELOG.md
files: bindings/nodejs/prebuilds/@iota/*
tag_name: ${{ steps.prepare_release.outputs.tag_name }}
target_commitish: ${{ github.sha }}
1 change: 1 addition & 0 deletions .github/workflows/bindings-python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ jobs:
body: https://github.com/iotaledger/iota-sdk/blob/develop/bindings/python/CHANGELOG.md
files: wheels/*
tag_name: ${{ steps.tagname.outputs.TAG_NAME }}
target_commitish: ${{ github.sha }}

- uses: actions/setup-python@v4
with:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/bindings-wasm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
shell: sh
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
run: yarn publish --access public
run: yarn publish --access public --tag alpha

- name: Prepare Github release
id: prepare_release
Expand All @@ -62,3 +62,4 @@ jobs:
body: "https://github.com/iotaledger/iota-sdk/blob/develop/bindings/wasm/CHANGELOG.md \n https://github.com/iotaledger/iota-sdk/blob/develop/bindings/nodejs/CHANGELOG.md"
files: bindings/wasm/*.tgz
tag_name: ${{ steps.prepare_release.outputs.tag_name }}
target_commitish: ${{ github.sha }}
5 changes: 1 addition & 4 deletions .github/workflows/private-tangle-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@ jobs:
uses: "./.github/actions/ledger-nano"

- name: Run tests
run: |
cargo nextest run test_get_info --all-features --run-ignored ignored-only --profile ci --cargo-profile ci -p iota-sdk -p iota-sdk-bindings-core --no-capture
# TODO: change in the future to run all tests and not only test_get_info
# cargo ci-tangle-test
run: cargo ci-tangle-test

- name: Tear down private tangle
if: always()
Expand Down
Loading

0 comments on commit 0e21c21

Please sign in to comment.