Skip to content

Commit

Permalink
Merge branch 'development' into merge-dev-feature-dan
Browse files Browse the repository at this point in the history
* development: (52 commits)
  chore: better help for seed-words command (tari-project#4885)
  fix(ci): resolve windows binary builds (tari-project#4883)
  fix(ci): correct ARM64 builds (tari-project#4876)
  fix(comms/peer_manager): fix possible panic in offline calc (tari-project#4877)
  feat!: impl final tari pow algorithm (tari-project#4862)
  fix(ci): selectively revert resolver for arm64 builds (tari-project#4871)
  chore(deps): bump actions/checkout from 2 to 3 (tari-project#4873)
  fix: delete orphans if they exist (tari-project#4868)
  chore: replace manual implementation of char methods (tari-project#4864)
  chore: fix potentially buggy split of string into lines (tari-project#4863)
  fix(ci): update GHA set-output plus dependabot schedule for GHA (tari-project#4857)
  fix(base-node): use less harsh emoji for unreachable node (tari-project#4855)
  fix(core): add txo version checks to async validator (tari-project#4852)
  feat: add static lifetime to emission amounts calculation (tari-project#4851)
  v0.38.8
  feat: add opcode versions (tari-project#4836)
  fix: remove clear_on_drop dependency (tari-project#4848)
  fix(base-node): use Network::from_str to parse network in cli (tari-project#4838)
  ci: remove circleci
  test: add cucumber critical (tari-project#4823)
  ...
  • Loading branch information
sdbondi committed Nov 7, 2022
2 parents 23b4313 + 9162b4f commit 371855c
Show file tree
Hide file tree
Showing 93 changed files with 728 additions and 4,006 deletions.
133 changes: 0 additions & 133 deletions .circleci/config.yml

This file was deleted.

8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
security_audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions-rs/audit-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
10 changes: 5 additions & 5 deletions .github/workflows/auto_labels.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
on:
'on':
workflow_run:
workflows:
- "Clippy check"
Expand All @@ -12,15 +12,15 @@ jobs:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Download workflow artifact
uses: dawidd6/action-download-artifact@v2.11.0
uses: dawidd6/action-download-artifact@v2.24.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
workflow: CI
run_id: ${{ github.event.workflow_run.id }}

- name: Read PR number
id: pr_num
uses: juliangruber/read-file-action@v1.0.0
uses: juliangruber/read-file-action@v1.1.6
with:
path: ./pr_num.txt

Expand All @@ -36,15 +36,15 @@ jobs:
if: ${{ github.event.workflow_run.conclusion == 'failure' }}
steps:
- name: Download workflow artifact
uses: dawidd6/action-download-artifact@v2.11.0
uses: dawidd6/action-download-artifact@v2.24.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
workflow: CI
run_id: ${{ github.event.workflow_run.id }}

- name: Read PR number
id: pr_num
uses: juliangruber/read-file-action@v1.0.0
uses: juliangruber/read-file-action@v1.1.6
with:
path: ./pr_num.txt

Expand Down
56 changes: 27 additions & 29 deletions .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Build Matrix of Binaries

on:
'on':
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+"
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
matrix=$(echo ${matrix_selection} | jq -s -c '{"builds": .}')
echo $matrix
echo $matrix | jq .
echo "::set-output name=matrix::$matrix"
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
matrix-check:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -111,31 +111,29 @@ jobs:
if: ${{ startsWith(runner.os,'Linux') && matrix.builds.name != 'linux-arm64' }}
run: |
sudo apt-get update
sudo apt-get -y install \
openssl \
libssl-dev \
pkg-config \
libsqlite3-dev \
clang-10 \
git \
cmake \
libc++-dev \
libc++abi-dev \
libprotobuf-dev \
protobuf-compiler \
libncurses5-dev \
libncursesw5-dev \
zip
sudo bash scripts/install_ubuntu_dependencies.sh
- name: Install macOS dependencies
if: startsWith(runner.os,'macOS')
run: brew install cmake zip coreutils automake autoconf
run: brew install cmake coreutils automake autoconf

- name: Install Windows dependencies
#continue-on-error: true # WARNING: workaround
if: startsWith(runner.os,'Windows')
run: |
vcpkg.exe install sqlite3:x64-windows zlib:x64-windows
choco upgrade llvm zip psutils openssl strawberryperl -y
# Bug in choco - need to install each package individually
choco upgrade llvm -y
choco upgrade psutils -y
choco upgrade openssl -y
choco upgrade strawberryperl -y
- name: Debugging - Upload logs if dependences failures
if: failure()
uses: actions/upload-artifact@v3
with:
name: ${{ env.TBN_FILENAME }}-windows-dependences-logs
path: C:\ProgramData\chocolatey\logs\chocolatey.log

- name: Set environment variables - Nix
if: "!startsWith(runner.os,'Windows')"
Expand Down Expand Up @@ -176,10 +174,9 @@ jobs:
echo "C:\Strawberry\perl\bin" >> $GITHUB_PATH
- name: Cache cargo files and outputs
uses: Swatinem/rust-cache@v1
uses: Swatinem/rust-cache@v2

- name: Build rust binaries - Normal
#if: ${{ matrix.builds.name != 'linux-arm64' }}
- name: Build rust binaries
uses: actions-rs/cargo@v1
env:
RUSTFLAGS: "-C target_cpu=${{ matrix.builds.target_cpu }}"
Expand All @@ -189,7 +186,7 @@ jobs:
command: build
args: --release --target ${{ matrix.builds.target }} --features ${{ matrix.builds.features }} ${{ matrix.builds.target_bins }} ${{ matrix.builds.flags }} --locked

- name: Copy binaries to folder for zipping
- name: Copy binaries to folder for archiving
shell: bash
run: |
mkdir -p "$GITHUB_WORKSPACE${TBN_DIST}"
Expand Down Expand Up @@ -308,7 +305,7 @@ jobs:
- name: Artifact upload for macOS pkg
if: startsWith(runner.os,'macOS')
continue-on-error: true
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{ env.TBN_FILENAME }}-${{ matrix.builds.name }}-${{ env.VERSION }}.pkg
path: "${{ env.distDirPKG }}/${{ env.TBN_FILENAME }}-${{ matrix.builds.name }}-${{ env.VERSION }}*.pkg"
Expand All @@ -323,7 +320,7 @@ jobs:
"%programfiles(x86)%\Inno Setup 6\iscc.exe" "/DMyAppVersion=${{ env.VERSION }}-${{ env.VSHA_SHORT }}-release" "/DTariSuitePath=${{ github.workspace }}${{ env.TBN_DIST }}" "windows_inno_installer.iss"
- name: Artifact upload for Windows installer
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: startsWith(runner.os,'Windows')
with:
name: "tari_windows_installer"
Expand All @@ -334,7 +331,8 @@ jobs:
run: |
echo "Archive ${{ env.BINFILE }} too ${{ env.BINFILE }}.zip"
cd "$GITHUB_WORKSPACE${{ env.TBN_DIST }}"
zip -j "${{ env.BINFILE }}.zip" *
#zip -j "${{ env.BINFILE }}.zip" *
7z a "${{ env.BINFILE }}.zip" *
echo "Compute shasum"
${SHARUN} "${{ env.BINFILE }}.zip" >> "${{ env.BINFILE }}.zip.sha256"
cat "${{ env.BINFILE }}.zip.sha256"
Expand All @@ -348,13 +346,13 @@ jobs:
fi
- name: Artifact upload for Archive
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{ env.TBN_FILENAME }}_archive-${{ matrix.builds.name }}
path: "${{ github.workspace }}${{ env.TBN_DIST }}/${{ env.BINFILE }}.zip*"

- name: Artifact upload for Miner
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: tari_miner-${{ matrix.builds.name }}
path: "${{ github.workspace }}${{ env.TBN_DIST }}/tari_miner${{ env.TBN_EXT}}"
Expand Down Expand Up @@ -427,7 +425,7 @@ jobs:
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
steps:
- name: Download binaries
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
- name: Create release
uses: ncipollo/release-action@v1
with:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/build_dockers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,28 +70,28 @@ jobs:
echo "SHA short - ${VSHA_SHORT}"
echo "VSHA_SHORT=${VSHA_SHORT}" >> $GITHUB_ENV
TOOLCHAIN=${{ github.event.inputs.toolchain }}
echo "::set-output name=toolchain::${TOOLCHAIN:-${{ env.toolchain_default }}}"
echo "toolchain=${TOOLCHAIN:-${{ env.toolchain_default }}}" >> $GITHUB_OUTPUT
if [[ "${{ github.ref }}" =~ ^refs/tags/v* ]] && [ "${{ github.event_name }}" != "workflow_dispatch" ] ; then
echo "Tagged Build - Build everything"
VERSION="${{ github.ref_name }}_$(date -u '+%Y%m%d')_${VSHA_SHORT}"
echo "Version used - ${VERSION}"
echo "::set-output name=platforms::linux/arm64, linux/amd64"
echo "::set-output name=version::${VERSION}"
echo "::set-output name=tag_alias::latest"
echo "::set-output name=build_items::all"
echo "platforms=linux/arm64, linux/amd64" >> $GITHUB_OUTPUT
echo "version=${VERSION}" >> $GITHUB_OUTPUT
echo "tag_alias=latest" >> $GITHUB_OUTPUT
echo "build_items=all" >> $GITHUB_OUTPUT
fi
if [ "${{ github.event_name }}" == "workflow_dispatch" ] ; then
echo "Manual Build - selective"
echo "::set-output name=platforms::${{ github.event.inputs.platforms }}"
echo "::set-output name=version::${{ github.event.inputs.version }}"
echo "::set-output name=tag_alias::${{ github.event.inputs.tag_alias }}"
echo "::set-output name=build_items::${{ github.event.inputs.build_items }}"
echo "platforms=${{ github.event.inputs.platforms }}" >> $GITHUB_OUTPUT
echo "version=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
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 "::set-output name=platforms::linux/amd64"
echo "::set-output name=tag_alias::latest-daily"
echo "::set-output name=build_items::tari_all"
echo "platforms=linux/amd64" >> $GITHUB_OUTPUT
echo "tag_alias=latest-daily" >> $GITHUB_OUTPUT
echo "build_items=tari_all" >> $GITHUB_OUTPUT
fi
builds_run:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/build_dockers_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ jobs:
echo $matrix
echo $matrix | jq .
echo "::set-output name=matrix::$matrix"
#echo "matrix=${matrix}" >> $GITHUB_ENV
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
docker_build:
name: Docker building ${{ matrix.builds.image_name }}
Expand Down Expand Up @@ -160,7 +159,7 @@ jobs:
fi
- name: Login to Docker Image Provider
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ${{ secrets.DOCKER_PROVIDER }}
username: ${{ secrets.DOCKER_USERNAME }}
Expand Down
Loading

0 comments on commit 371855c

Please sign in to comment.