Skip to content

Commit

Permalink
chore(nextnet): version bump to 0.52.0 rc.0 (#5921)
Browse files Browse the repository at this point in the history
Description
---
Moving up and moving on

Motivation and Context
---
Improving the network

How Has This Been Tested?
---
CI


Breaking Changes
---

- [ ] None
- [x] Requires data directory on base node to be deleted
- [x] Requires hard fork
- [x] Other - Please specify

So so many breaking changes.
  • Loading branch information
SWvheerden authored Nov 7, 2023
2 parents 2ca4aa7 + b0363da commit 3e702d1
Show file tree
Hide file tree
Showing 512 changed files with 21,483 additions and 16,379 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
security_audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: rustsec/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
3 changes: 2 additions & 1 deletion .github/workflows/base_node_binaries.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"cross": false,
"target_cpu": "generic",
"target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
"features": "safe"
"features": "safe",
"build_enabled": false
},
{
"name": "windows-x64",
Expand Down
43 changes: 30 additions & 13 deletions .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: false

Expand All @@ -58,6 +58,8 @@ jobs:
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
matrix-check:
# Debug matrix
if: ${{ false }}
runs-on: ubuntu-latest
needs: matrix-prep
steps:
Expand All @@ -83,7 +85,7 @@ jobs:

steps:
- name: Checkout source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

Expand Down Expand Up @@ -140,7 +142,8 @@ jobs:
# psutils is out of date
# choco upgrade psutils -y
choco upgrade openssl -y
choco upgrade strawberryperl -y
# Should already be installed
# choco upgrade strawberryperl -y
- name: Debugging - Upload logs if dependences failures
if: failure()
Expand All @@ -165,15 +168,6 @@ jobs:
echo "PLATFORM_SPECIFIC_DIR=osx" >> $GITHUB_ENV
echo "LIB_EXT=.dylib" >> $GITHUB_ENV
# Hardcoded sdk for MacOSX 11 on ARM64
- name: Set environment variables - macOS - ARM64 (pin/sdk)
if: ${{ startsWith(runner.os,'macOS') && matrix.builds.name == 'macos-arm64' }}
run: |
xcrun --show-sdk-path
ls -la "/Library/Developer/CommandLineTools/SDKs/"
echo "RANDOMX_RS_CMAKE_OSX_SYSROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk" >> $GITHUB_ENV
rustup target add ${{ matrix.builds.target }}
- name: Set environment variables - Ubuntu
if: startsWith(runner.os,'Linux')
run: |
Expand Down Expand Up @@ -357,7 +351,14 @@ jobs:
run: |
cd buildtools
call generate_config.bat
"%programfiles(x86)%\Inno Setup 6\iscc.exe" "/DMyAppVersion=${{ env.VERSION }}-${{ env.VSHA_SHORT }}-release" "/DTariSuitePath=${{ github.workspace }}${{ env.TBN_DIST }}" "windows_inno_installer.iss"
"%programfiles(x86)%\Inno Setup 6\iscc.exe" "/DMyAppVersion=${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer" "/DTariSuitePath=${{ github.workspace }}${{ env.TBN_DIST }}" "windows_inno_installer.iss"
cd Output
echo "Compute archive shasum"
${{ env.SHARUN }} "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe" >> "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
echo "Show the shasum"
cat "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
echo "Checkum verification archive is "
${{ env.SHARUN }} --check "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
- name: Artifact upload for Windows installer
uses: actions/upload-artifact@v3
Expand All @@ -374,12 +375,14 @@ jobs:
cd "$GITHUB_WORKSPACE${{ env.TBN_DIST }}"
echo "Compute files shasum"
${SHARUN} * >> "${{ env.BINFILE }}.sha256"
echo "Show the shasum"
cat "${{ env.BINFILE }}.sha256"
echo "Checksum verification for files is "
${SHARUN} --check "${{ env.BINFILE }}.sha256"
7z a "${{ env.BINFILE }}.zip" *
echo "Compute archive shasum"
${SHARUN} "${{ env.BINFILE }}.zip" >> "${{ env.BINFILE }}.zip.sha256"
echo "Show the shasum"
cat "${{ env.BINFILE }}.zip.sha256"
echo "Checkum verification archive is "
${SHARUN} --check "${{ env.BINFILE }}.zip.sha256"
Expand All @@ -399,6 +402,7 @@ jobs:
echo "Compute miner shasum"
${SHARUN} "minotari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}" \
>> "minotari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}.sha256"
echo "Show the shasum"
cat "minotari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}.sha256"
echo "Checksum verification for miner is "
${SHARUN} --check "minotari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}.sha256"
Expand Down Expand Up @@ -444,6 +448,18 @@ jobs:
shell: bash
run: |
rm -vRf "${{ github.workspace }}${{ env.TBN_DIST }}/diag-utils/"
- name: Artifact Windows Installer for S3
continue-on-error: true
shell: bash
run: |
if [ -d "${{ github.workspace }}/buildtools/Output/" ]; then
echo "Coping Windows installer ..."
cp -v "${{ github.workspace }}/buildtools/Output/"* \
"${{ github.workspace }}${{ env.TBN_DIST }}"
else
echo "No buildtools/Output."
fi
- name: Sync dist to S3 - Bash
continue-on-error: true # Don't break if s3 upload fails
Expand All @@ -456,6 +472,7 @@ jobs:
else
ls -al ${{ env.SOURCE }}
fi
aws s3 ${{ env.S3CMD }} --region ${{ secrets.AWS_REGION }} \
"${{ env.SOURCE }}" \
s3://${{ secrets.AWS_S3_BUCKET }}/${{ env.DEST_DIR }} \
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/build_dockers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,18 @@ jobs:
echo "tag_alias=${{ github.event.inputs.tag_alias }}" >> $GITHUB_OUTPUT
echo "build_items=${{ github.event.inputs.build_items }}" >> $GITHUB_OUTPUT
fi
if [ "${{ github.event_name }}" == "schedule" ] && [ "${{ github.event.schedule }}" == "05 00 * * *" ] ; then
echo "Daily Build - limited"
echo "platforms=linux/amd64" >> $GITHUB_OUTPUT
echo "tag_alias=latest-daily" >> $GITHUB_OUTPUT
echo "build_items=minotari_all" >> $GITHUB_OUTPUT
if [ "${{ github.event_name }}" == "schedule" ] ; then
if [[ $(date +%u) -eq 7 ]] ; then
echo "Weekly Build - limited dual arch"
echo "platforms=linux/arm64, linux/amd64" >> $GITHUB_OUTPUT
echo "tag_alias=latest-weekly" >> $GITHUB_OUTPUT
echo "build_items=minotari_all" >> $GITHUB_OUTPUT
else
echo "Daily Build - limited"
echo "platforms=linux/amd64" >> $GITHUB_OUTPUT
echo "tag_alias=latest-daily" >> $GITHUB_OUTPUT
echo "build_items=minotari_all" >> $GITHUB_OUTPUT
fi
fi
builds_run:
Expand Down
33 changes: 19 additions & 14 deletions .github/workflows/build_dockers_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

steps:
- name: checkout tari-launchpad
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.LAUNCHPAD_REPO }}
ref: ${{ env.LAUNCHPAD_BRANCH }}
Expand Down Expand Up @@ -101,12 +101,12 @@ jobs:

steps:
- name: checkout tari
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: tari

- name: checkout tari-launchpad
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.LAUNCHPAD_REPO }}
ref: ${{ env.LAUNCHPAD_BRANCH }}
Expand All @@ -124,7 +124,7 @@ jobs:
shell: bash
run: |
IMAGE_NAME=${{ matrix.builds.image_name }}
if [ -z "${{ inputs.version }}" ]; then
if [ -z "${{ inputs.version }}" ] ; then
echo "Get tari version"
TARI_SOURCE_ROOT="tari/"
VAPP=$(awk -F ' = ' \
Expand All @@ -139,9 +139,14 @@ jobs:
fi
echo "Setting ${VERSION} as docker tag"
echo "VERSION=${VERSION}" >> $GITHUB_ENV
if [ ! -z "${{ inputs.tag_alias }}" ]; then
echo "Setup tag_alias"
echo "TAG_ALIAS=${{ secrets.DOCKER_PROVIDER }}/${{ secrets.DOCKER_REPO }}/${{ matrix.builds.image_name }}:${{ inputs.tag_alias }}" >> $GITHUB_ENV
if [ ! -z "${{ inputs.tag_alias }}" ] ; then
if [ -z "${{ env.TARI_NETWORK }}" ] ; then
echo "Setup tag_alias"
echo "TAG_ALIAS=${{ secrets.DOCKER_PROVIDER }}/${{ secrets.DOCKER_REPO }}/${{ matrix.builds.image_name }}:${{ inputs.tag_alias }}" >> $GITHUB_ENV
else
echo "Setup tag_alias with network"
echo "TAG_ALIAS=${{ secrets.DOCKER_PROVIDER }}/${{ secrets.DOCKER_REPO }}/${{ matrix.builds.image_name }}:${{ inputs.tag_alias }}-${{ env.TARI_NETWORK }}" >> $GITHUB_ENV
fi
fi
if [ "${IMAGE_NAME:0:9}" = "minotari_" ] ; then
echo "Minotari builds"
Expand All @@ -152,7 +157,7 @@ jobs:
echo "APP_EXEC=${{ matrix.builds.app_exec }}" >> $GITHUB_ENV
else
echo "3rd Party builds - ${IMAGE_NAME}"
if [ -f "./tari-launchpad/docker_rig/${IMAGE_NAME}.Dockerfile" ]; then
if [ -f "./tari-launchpad/docker_rig/${IMAGE_NAME}.Dockerfile" ] ; then
echo "DOCKERFILE=${IMAGE_NAME}" >> $GITHUB_ENV
SUBTAG=$(awk -v search="^ARG ${IMAGE_NAME^^}?_VERSION=" -F '=' '$0 ~ search \
{ gsub(/["]/, "", $2); printf("%s",$2) }' \
Expand All @@ -167,14 +172,14 @@ jobs:
fi
- name: Set up QEMU for Docker
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
#name/${{ matrix.builds.image_name }}
Expand All @@ -188,23 +193,23 @@ jobs:
type=sha
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
#username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Login to Docker Image Provider
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ secrets.DOCKER_PROVIDER }}
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Docker image build and push
id: docker_build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./tari/
file: ./tari-launchpad/docker_rig/${{ env.DOCKERFILE }}.Dockerfile
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/build_libffis.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[
{
"runs-on": "ubuntu-latest",
"target": "x86_64-linux-android",
"cross": true
},
{
"runs-on": "ubuntu-latest",
"target": "aarch64-linux-android",
"cross": true
},
{
"runs-on": "macos-latest",
"target": "x86_64-apple-ios",
"cross": false
},
{
"runs-on": "macos-latest",
"target": "aarch64-apple-ios",
"cross": false
},
{
"runs-on": "macos-latest",
"target": "aarch64-apple-ios-sim",
"cross": false
}
]
Loading

0 comments on commit 3e702d1

Please sign in to comment.