Skip to content

Commit

Permalink
Merge branch 'development' into update-feature-dan2
Browse files Browse the repository at this point in the history
* development:
  fix!: avoid `Encryptable` domain collisions (#6275)
  ci(fix): docker image build fix and ci improvements (#6270)
  feat: keep smt memory (#6265)
  feat: show warning when GRPC method is disallowed (#6246)
  fix(chat): metadata panic (#6247)
  feat: add monerod detection as an option to the merge mining proxy (#6248)
  chore(deps): bump h2 from 0.3.24 to 0.3.26 (#6250)
  feat: improve lmdb dynamic growth (#6242)
  feat: allow wallet type from db to have preference (#6245)
  feat: prevent mempool panic (#6239)
  ci: bump nightly version (#6241)
  feat: add validation for zero confirmation block sync (#6237)
  feat: new template with coinbase call (#6226)
  feat: improve wallet sql queries (#6232)
  chore: remove ahash as dependancy (#6238)
  feat: add dynamic growth to lmdb (#6231)
  chore(deps): bump borsh from 0.10.3 to 1.0.0 in /applications/minotari_ledger_wallet (#6236)
  • Loading branch information
sdbondi committed Apr 15, 2024
2 parents f6196cb + 39a3fba commit 00cdbb0
Show file tree
Hide file tree
Showing 129 changed files with 2,916 additions and 887 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/base_node_binaries.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"name": "linux-x86_64",
"runs-on": "ubuntu-20.04",
"rust": "nightly-2023-12-12",
"rust": "nightly-2024-02-04",
"target": "x86_64-unknown-linux-gnu",
"cross": false
},
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
TBN_FEATURES: "default, safe"
TBN_LIBRARIES: "minotari_mining_helper_ffi"
TARI_NETWORK_DIR: testnet
toolchain: nightly-2023-12-12
toolchain: nightly-2024-02-04
matrix-json-file: ".github/workflows/base_node_binaries.json"
CARGO_HTTP_MULTIPLEXING: false
CARGO_UNSTABLE_SPARSE_REGISTRY: true
Expand Down Expand Up @@ -130,7 +130,9 @@ jobs:
run: |
echo "VBRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
echo "VSHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
TARI_VERSION=$(awk -F ' = ' '$1 ~ /version/ { gsub(/["]/, "", $2); printf("%s",$2) }' "$GITHUB_WORKSPACE/applications/minotari_node/Cargo.toml")
TARI_VERSION=$(awk -F ' = ' '$1 ~ /^version/ \
{ gsub(/["]/, "", $2); printf("%s",$2) }' \
"$GITHUB_WORKSPACE/applications/minotari_node/Cargo.toml")
echo "TARI_VERSION=${TARI_VERSION}" >> $GITHUB_ENV
echo "TARI_VERSION=${TARI_VERSION}" >> $GITHUB_OUTPUT
if [[ "${{ matrix.builds.features }}" == "" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_dockers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ name: Build docker images
- xmrig

env:
toolchain_default: nightly-2023-12-12
toolchain_default: nightly-2024-02-04

concurrency:
# https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/build_dockers_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ name: Build docker images - workflow_call/on-demand
toolchain:
type: string
description: 'Rust toolchain'
default: nightly-2023-12-12
default: nightly-2024-02-04
arch:
type: string
default: x86-64
Expand Down Expand Up @@ -134,10 +134,9 @@ jobs:
if [ -z "${{ inputs.version }}" ] ; then
echo "Get tari version"
TARI_SOURCE_ROOT="tari/"
VAPP=$(awk -F ' = ' \
'$1 ~ /version/ { gsub(/["]/, "", $2); printf("%s",$2) }' \
VAPP=$(awk -F ' = ' '$1 ~ /^version/ \
{ gsub(/["]/, "", $2); printf("%s",$2) }' \
"${TARI_SOURCE_ROOT}/applications/minotari_node/Cargo.toml")
VBRANCH=$(git --git-dir ${TARI_SOURCE_ROOT}/.git branch --show-current)
VSHA_SHORT=$(git --git-dir ${TARI_SOURCE_ROOT}/.git rev-parse --short HEAD)
VERSION="v${VAPP}_${VBRANCH}_$(date -u '+%Y%m%d')_${VSHA_SHORT}"
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/build_libffis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
## build only single target image
# matrix_selection=$( jq -c '.[] | select( ."runs-on" == "ubuntu-latest" )' ${{ env.matrix-json-file }} )
# matrix_selection=$( jq -c '.[] | select( ."target" == "x86_64-linux-android" )' ${{ env.matrix-json-file }} )
# matrix_selection=$( jq -c '.[] | select( ."target" | contains("android") )' ${{ env.matrix-json-file }} )
#
## buid select target images - build_enabled
matrix_selection=$( jq -c '.[] | select( ."build_enabled" != false )' ${{ env.matrix-json-file }} )
Expand Down Expand Up @@ -225,9 +226,12 @@ jobs:
path: ${{ runner.temp }}/lib${{ matrix.libffis }}-${{ env.TARGET_PLATFORM }}-${{ env.TARGET_ARCH }}${{ env.TARGET_SIM }}

ios_assemble:
name: Assemble iOS multiArch for ${{ matrix.libffis }}"
name: Assemble iOS multiArch for ${{ matrix.libffis }}
# Disable iOS Assembly workflow
#if: ${{ false }}
#continue-on-error: true

# Limits to only iOS builds
# Limits to only iOS builds?
runs-on: macos-latest
needs: [matrix-prep, builds]

Expand Down Expand Up @@ -353,9 +357,11 @@ jobs:

create_release:
name: Create release for ffi libraries
if: ${{ startsWith(github.ref, 'refs/tags/v') }}

runs-on: ubuntu-latest
needs: [matrix-prep, builds, ios_assemble]
if: ${{ startsWith(github.ref, 'refs/tags/v') }}

steps:
- name: Download all ffi libraries
uses: actions/download-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ name: CI
merge_group:

env:
toolchain: nightly-2023-12-12
toolchain: nightly-2024-02-04
CARGO_HTTP_MULTIPLEXING: false
CARGO_TERM_COLOR: always
CARGO_UNSTABLE_SPARSE_REGISTRY: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ name: Source Coverage
- ci-coverage-*

env:
toolchain: nightly-2023-12-12
toolchain: nightly-2024-02-04

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ name: Integration tests
type: string

env:
toolchain: nightly-2023-12-12
toolchain: nightly-2024-02-04

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
Loading

0 comments on commit 00cdbb0

Please sign in to comment.