diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6803ecf35a..ba073af634 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,23 +4,31 @@ name: DigiByte CI +permissions: + contents: read + concurrency: group: ${{ github.event_name != 'pull_request' && github.run_id || github.ref }} cancel-in-progress: true on: pull_request: - branches: [develop, master] + branches: ["develop"] env: CI_FAILFAST_TEST_LEAVE_DANGLING: 1 # GHA does not care about dangling processes and setting this variable avoids killing the CI script itself on error jobs: build: - runs-on: ubuntu-latest + runs-on: macos-latest steps: - uses: actions/checkout@v2 + - name: Set up Python 3.10.9 + uses: actions/setup-python@v2 + with: + python-version: 3.10.9 + - name: Cache pip id: cache-pip uses: actions/cache@v3 @@ -31,67 +39,32 @@ jobs: key: v1-${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: v1-${{ runner.os }}-pip- - - name: Cache BerkeleyDB - id: cache-db4 - uses: actions/cache@v3 - with: - path: db4 - key: v1-${{ runner.os }}-db4-${{ hashFiles('contrib/install_db4.sh') }} - restore-keys: v1-${{ runner.os }}-db4- - - - name: Cache depends build - id: cache-depends - uses: actions/cache@v3 - with: - path: | - depends/built - depends/sources - depends/sdk-sources - depends/work - depends/x86_64-linux-gnu - key: v1-${{ runner.os }}-depends-${{ hashFiles('depends/Makefile') }} - restore-keys: | - v1-${{ runner.os }}-depends- - - - name: Install Build Dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libtool autotools-dev automake pkg-config python3 \ - libssl-dev bsdmainutils libevent-dev \ - libboost-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev \ - libsqlite3-dev \ - libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools \ - libqrencode-dev python3-zmq + - name: Install brew dependencies + run: brew install autoconf automake libtool pkg-config pandoc - name: Install Python Packages if: steps.cache-pip.outputs.cache-hit != 'true' run: | pip3 install pypandoc digibyte_scrypt pyzmq - - name: Install BerkeleyDB - if: steps.cache-db4.outputs.cache-hit != 'true' - run: | - ./contrib/install_db4.sh `pwd` --enable-cxx - - name: Build Dependencies - if: steps.cache-depends.outputs.cache-hit != 'true' run: | cd depends - make -j$(nproc) HOST=x86_64-linux-gnu + make -j2 HOST=aarch64-apple-darwin24.2.0 cd .. - name: Configure and Build run: | ./autogen.sh - CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure --with-bdb --with-sqlite --with-gui=yes --with-zmq - make -j$(nproc) + CONFIG_SITE=$PWD/depends/aarch64-apple-darwin24.2.0/share/config.site ./configure --with-bdb --with-sqlite --with-gui=yes --with-zmq + make -j2 - name: Run Tests - run: make check -j$(nproc) + run: make check - name: Upload Test Suite Log uses: actions/upload-artifact@v3 if: failure() with: name: test-suite-log - path: test-suite.log + path: src/test-suite.log \ No newline at end of file diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6d28f09789..556f7450b1 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -11,24 +11,19 @@ # name: "CodeQL Advanced" -# Add this concurrency configuration right after the 'name' field +permissions: + contents: read + concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true on: - push: - branches: ["develop", "master", "release**/**/*"] - paths-ignore: - - 'depends/**' - - 'contrib/**' pull_request: - branches: ["develop", "master", "release**/**/*"] + branches: ["develop"] paths-ignore: - 'depends/**' - 'contrib/**' - schedule: - - cron: "0 0 * * 0" jobs: analyze: @@ -38,7 +33,7 @@ jobs: # - https://gh.io/supported-runners-and-hardware-resources # - https://gh.io/using-larger-runners (GitHub.com only) # Consider using larger runners or machines with greater resources for possible analysis time improvements. - runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + runs-on: macos-latest #${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} permissions: # required for all workflows security-events: write @@ -86,6 +81,21 @@ jobs: dependency-caching: true config-file: ./.github/codeql/codeql-config.yml + - if: matrix.build-mode == 'manual' + name: Set up Python 3.10.9 + uses: actions/setup-python@v2 + with: + python-version: 3.10.9 + + - if: matrix.build-mode == 'manual' + name: Install brew dependencies + run: arch -arm64 brew install autoconf automake libtool pkg-config pandoc + + - if: matrix.build-mode == 'manual' + name: Install Python Packages + run: | + pip3 install pypandoc digibyte_scrypt pyzmq + # If the analyze step fails for one of the languages you are analyzing with # "We were unable to automatically build your code", modify the matrix above # to set the build mode to "manual" for that language. Then modify this step @@ -95,27 +105,15 @@ jobs: - if: matrix.build-mode == 'manual' shell: bash run: | - # Cache management from your existing workflow - sudo apt-get update - sudo apt-get install -y build-essential libtool autotools-dev automake pkg-config python3 \ - libssl-dev bsdmainutils libevent-dev \ - libboost-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev \ - libsqlite3-dev \ - libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools \ - libqrencode-dev python3-zmq - - # Install BerkeleyDB - ./contrib/install_db4.sh `pwd` --enable-cxx - # Build Dependencies cd depends - make -j$(nproc) HOST=x86_64-linux-gnu + make -j2 HOST=aarch64-apple-darwin24.2.0 cd .. # Configure and Build ./autogen.sh - CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure --with-bdb --with-sqlite --with-gui=yes --with-zmq - make -j$(nproc) + CONFIG_SITE=$PWD/depends/aarch64-apple-darwin24.2.0/share/config.site ./configure --with-bdb --with-sqlite --with-gui=no --with-zmq + make -j2 - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/configure.ac b/configure.ac index 07eae8dd35..72ee9dd039 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2025) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[DigiByte Core]]) -AC_INIT([DigiByte Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/DigiByte-Core/digibyte/issues],[digibyte],[https://digibyte.org/]) +AC_INIT([DigiByte Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD),[https://github.com/DigiByte-Core/digibyte/issues],[digibyte],[https://digibyte.org/]) AC_CONFIG_SRCDIR([src/validation.cpp]) AC_CONFIG_HEADERS([src/config/digibyte-config.h]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index ebbd4c79c8..e85c5fd2a0 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,6 +1,6 @@ package=boost $(package)_version=1_84_0 -$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/ +$(package)_download_path=https://archives.boost.io/release/$(subst _,.,$($(package)_version))/source/ $(package)_file_name=boost_$($(package)_version).tar.bz2 $(package)_sha256_hash=cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454 $(package)_dependencies=native_b2 diff --git a/src/qt/res/icons/digibyte_wallet.png b/src/qt/res/icons/digibyte_wallet.png index 608a3608d3..e90b8f0f4f 100644 Binary files a/src/qt/res/icons/digibyte_wallet.png and b/src/qt/res/icons/digibyte_wallet.png differ diff --git a/src/qt/res/icons/digibyte_wallet_blank.png b/src/qt/res/icons/digibyte_wallet_blank.png index 10368c09f7..2bb6a22597 100644 Binary files a/src/qt/res/icons/digibyte_wallet_blank.png and b/src/qt/res/icons/digibyte_wallet_blank.png differ