Skip to content

Commit

Permalink
Merge development
Browse files Browse the repository at this point in the history
  • Loading branch information
hansieodendaal committed Nov 28, 2024
1 parent 1104d20 commit c21e656
Show file tree
Hide file tree
Showing 49 changed files with 244 additions and 151 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
run: |
BRANCH_NAME=$(echo "${GITHUB_REF}" | sed 's|refs/heads/||')
if [[ "${BRANCH_NAME}" == "build-bins-nextnet"* ]]; then
source buildtools/multinet_envs.sh "v1.8.0-rc.0"
source buildtools/multinet_envs.sh "v1.9.0-rc.0"
else
source buildtools/multinet_envs.sh ${{ env.GHA_NETWORK }}
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_test_results_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
files: "artifacts/**/*.xml"

- name: Publish Test Report 2
uses: mikepenz/action-junit-report@v4
uses: mikepenz/action-junit-report@v5
if: always()
with:
report_paths: "artifacts/**/*.xml"
Expand Down
78 changes: 39 additions & 39 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["The Tari Development Community"]
repository = "https://github.com/tari-project/tari"
license = "BSD-3-Clause"
version = "1.8.0-pre.0"
version = "1.9.0-pre.0"
edition = "2021"

[workspace]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ The recommended running versions of each network are:
| Network | Version |
|-----------|----------------|
| Stagenet | 1.0.0-alpha.0a |
| Nextnet | 1.8.0-rc.0 |
| Esmeralda | 1.8.0-pre.0 |
| Nextnet | 1.9.0-rc.0 |
| Esmeralda | 1.9.0-pre.0 |

For more detail about versioning, see [Release Ideology](https://github.com/tari-project/tari/blob/development/docs/src/branching_releases.md).

Expand Down
Loading

0 comments on commit c21e656

Please sign in to comment.