diff --git a/.github/scripts/00-install-deps.sh b/.github/scripts/00-install-deps.sh index dc190a120f..b1fc8257d4 100755 --- a/.github/scripts/00-install-deps.sh +++ b/.github/scripts/00-install-deps.sh @@ -65,7 +65,10 @@ elif [[ ${OS} == "osx" ]]; then s3curl \ sleuthkit \ bison \ - libtinfo5 + libtinfo5 \ + python3-pip + + pip3 install ds-store elif [[ ${OS} == "linux" || ${OS} == "linux-disable-wallet" || ${OS} == "aarch64" || ${OS} == "aarch64-disable-wallet" ]]; then apt -y install \ @@ -80,10 +83,10 @@ elif [[ ${OS} == "linux" || ${OS} == "linux-disable-wallet" || ${OS} == "aarch64 ca-certificates \ curl \ g++-aarch64-linux-gnu \ - g++-8-aarch64-linux-gnu \ - g++-8-multilib \ - gcc-8-aarch64-linux-gnu \ - gcc-8-multilib \ + g++-9-aarch64-linux-gnu \ + g++-9-multilib \ + gcc-9-aarch64-linux-gnu \ + gcc-9-multilib \ git \ gnupg \ libtool \ @@ -110,13 +113,13 @@ elif [[ ${OS} == "arm32v7" || ${OS} == "arm32v7-disable-wallet" ]]; then ca-certificates \ curl \ g++-aarch64-linux-gnu \ - g++-8-aarch64-linux-gnu \ - gcc-8-aarch64-linux-gnu \ + g++-9-aarch64-linux-gnu \ + gcc-9-aarch64-linux-gnu \ g++-arm-linux-gnueabihf \ - g++-8-arm-linux-gnueabihf \ - gcc-8-arm-linux-gnueabihf \ - g++-8-multilib \ - gcc-8-multilib \ + g++-9-arm-linux-gnueabihf \ + gcc-9-arm-linux-gnueabihf \ + g++-9-multilib \ + gcc-9-multilib \ git \ libtool \ pkg-config \ diff --git a/.github/scripts/02-copy-build-dependencies.sh b/.github/scripts/02-copy-build-dependencies.sh index 1602a8fc1d..297e01e71b 100755 --- a/.github/scripts/02-copy-build-dependencies.sh +++ b/.github/scripts/02-copy-build-dependencies.sh @@ -3,7 +3,6 @@ OS=${1} GITHUB_WORKSPACE=${2} GITHUB_REF=${3} -FORCEBUILDDEPS="1" if [[ ! ${OS} || ! ${GITHUB_WORKSPACE} ]]; then echo "Error: Invalid options" @@ -18,51 +17,20 @@ if [[ ${OS} == "arm32v7-disable-wallet" || ${OS} == "linux-disable-wallet" || ${ OS=`echo ${OS} | cut -d"-" -f1` fi -if [[ ${GITHUB_REF} =~ "release" || ${FORCEBUILDDEPS} = "1" ]]; then - echo "----------------------------------------" - echo "Building Dependencies for ${OS}" - echo "----------------------------------------" - - cd depends - if [[ ${OS} == "windows" ]]; then - make HOST=x86_64-w64-mingw32 -j2 - elif [[ ${OS} == "osx" ]]; then - cd ${GITHUB_WORKSPACE} - # curl -O - echo "LEGAL issues with OSX SDK, need to get it yourself and extract the valuable stuff." - echo "See github -> contrib/macdeploy/README.md" - echo "Countdown from 3 sec. Make sure your SDK is at /tmp/SDKs and it is the only *.tar.gz file." - echo "3..." - sleep 1 - echo "2..." - sleep 1 - echo "1..." - sleep 1 - echo "0.. continuing.." - mkdir -p ${GITHUB_WORKSPACE}/depends/SDKs - cd ${GITHUB_WORKSPACE}/depends/SDKs - tar -zxf /tmp/SDKs/*.tar.gz - cd ${GITHUB_WORKSPACE}/depends && make HOST=x86_64-apple-darwin14 -j2 - elif [[ ${OS} == "linux" || ${OS} == "linux-disable-wallet" ]]; then - make HOST=x86_64-linux-gnu -j2 - elif [[ ${OS} == "arm32v7" || ${OS} == "arm32v7-disable-wallet" ]]; then - make HOST=arm-linux-gnueabihf -j2 - elif [[ ${OS} == "aarch64" || ${OS} == "aarch64-disable-wallet" ]]; then - make HOST=aarch64-linux-gnu -j2 - fi -else - echo "----------------------------------------" - echo "Retrieving Dependencies for ${OS}" - echo "----------------------------------------" +echo "----------------------------------------" +echo "Building Dependencies for ${OS}" +echo "----------------------------------------" - cd /tmp - curl -O https://raven-build-resources.s3.amazonaws.com/${OS}/raven-${OS}-dependencies.tar.gz - curl -O https://raven-build-resources.s3.amazonaws.com/${OS}/SHASUM - if [[ $(sha256sum -c /tmp/SHASUM) ]]; then - cd ${GITHUB_WORKSPACE}/depends - tar zxvf /tmp/raven-${OS}-dependencies.tar.gz - else - echo "SHASUM doesn't match" - exit 1 - fi +cd depends +if [[ ${OS} == "windows" ]]; then + make HOST=x86_64-w64-mingw32 -j2 +elif [[ ${OS} == "osx" ]]; then + echo "OSX building is not currently enabled" + exit 1 +elif [[ ${OS} == "linux" || ${OS} == "linux-disable-wallet" ]]; then + make HOST=x86_64-linux-gnu -j2 +elif [[ ${OS} == "arm32v7" || ${OS} == "arm32v7-disable-wallet" ]]; then + make HOST=arm-linux-gnueabihf -j2 +elif [[ ${OS} == "aarch64" || ${OS} == "aarch64-disable-wallet" ]]; then + make HOST=aarch64-linux-gnu -j2 fi diff --git a/.github/workflows/build-raven.yml b/.github/workflows/build-raven.yml index 53d55e1b0c..f12bad77f2 100644 --- a/.github/workflows/build-raven.yml +++ b/.github/workflows/build-raven.yml @@ -26,7 +26,7 @@ env: jobs: check-jobs: # continue-on-error: true # Uncomment once integration is finished - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 # Map a step output to a job output outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} @@ -52,11 +52,10 @@ jobs: build: needs: check-jobs - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: OS: [ 'windows', 'linux', 'linux-disable-wallet', 'arm32v7', 'arm32v7-disable-wallet', 'aarch64', 'aarch64-disable-wallet' ] -# OS: [ 'windows', 'linux', 'linux-disable-wallet', 'osx', 'arm32v7', 'arm32v7-disable-wallet' ] steps: - if: ${{ needs.check-jobs.outputs.should_skip != 'true' }} @@ -69,7 +68,7 @@ jobs: - if: ${{ needs.check-jobs.outputs.should_skip != 'true' }} name: Cache dependencies. - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ${{ GITHUB.WORKSPACE }}/depends/built diff --git a/.github/workflows/dependencies-arm32v7.yml b/.github/workflows/dependencies-arm32v7.yml deleted file mode 100644 index 6da65c9334..0000000000 --- a/.github/workflows/dependencies-arm32v7.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Dependencies - Arm32v7 - -on: - pull_request: - branches: - - depends - paths: - - 'depends/**' - push: - branches: - - depends - paths: - - 'depends/**' - -env: - OS: arm32v7 - SCRIPTS: ${{ GITHUB.WORKSPACE }}/.github/scripts - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - name: Checkout the Code - uses: actions/checkout@v1 - - - name: Install Build Tools - run: sudo ${SCRIPTS}/00-install-deps.sh ${OS} - - - name: Build the Dependencies - run: cd depends && make HOST=arm-linux-gnueabihf -j2 - - - name: Tar Up the Dependencies - run: | - if [[ ! -e ${{ GITHUB.WORKSPACE }}/depends_temp ]]; then mkdir -p ${{ GITHUB.WORKSPACE }}/depends_temp; fi - cd ${{ GITHUB.WORKSPACE }}/depends && tar zcf ${{ GITHUB.WORKSPACE }}/depends_temp/raven-arm32v7-dependencies.tar.gz . - cd ${{ GITHUB.WORKSPACE }}/depends_temp - if [[ -e raven-arm32v7-dependencies.tar.gz ]]; then sha256sum raven-arm32v7-dependencies.tar.gz > SHASUM; else echo "no dependency tar file found"; fi - - - name: Sync the Dependencies to S3 - uses: jakejarvis/s3-sync-action@master - with: - args: --acl public-read --follow-symlinks - env: - SOURCE_DIR: "${{ GITHUB.WORKSPACE }}/depends_temp/" - DEST_DIR: 'arm' - AWS_REGION: 'us-east-1' - AWS_S3_BUCKET: "raven-build-resources" - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/dependencies-linux.yml b/.github/workflows/dependencies-linux.yml deleted file mode 100644 index 4323b2f14c..0000000000 --- a/.github/workflows/dependencies-linux.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Dependencies - Linux - -on: - pull_request: - branches: - - depends - paths: - - 'depends/**' - push: - branches: - - depends - paths: - - 'depends/**' - -env: - OS: linux - SCRIPTS: ${{ GITHUB.WORKSPACE }}/.github/scripts - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - name: Checkout the Code - uses: actions/checkout@v1 - - - name: Install Build Tools - run: sudo ${SCRIPTS}/00-install-deps.sh ${OS} - - - name: Build the Dependencies - run: cd depends && make HOST=x86_64-linux-gnu -j2 - - - name: Tar Up the Dependencies - run: | - if [[ ! -e ${{ GITHUB.WORKSPACE }}/depends_temp ]]; then mkdir -p ${{ GITHUB.WORKSPACE }}/depends_temp; fi - cd ${{ GITHUB.WORKSPACE }}/depends && tar zcf ${{ GITHUB.WORKSPACE }}/depends_temp/raven-linux-dependencies.tar.gz . - cd ${{ GITHUB.WORKSPACE }}/depends_temp - if [[ -e raven-linux-dependencies.tar.gz ]]; then sha256sum raven-linux-dependencies.tar.gz > SHASUM; else echo "no dependency tar file found"; fi - - - name: Sync the Dependencies to S3 - uses: jakejarvis/s3-sync-action@master - with: - args: --acl public-read --follow-symlinks - env: - SOURCE_DIR: "${{ GITHUB.WORKSPACE }}/depends_temp/" - DEST_DIR: 'linux' - AWS_REGION: 'us-east-1' - AWS_S3_BUCKET: "raven-build-resources" - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/dependencies-osx.yml b/.github/workflows/dependencies-osx.yml deleted file mode 100644 index caaa867309..0000000000 --- a/.github/workflows/dependencies-osx.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Dependencies - Mac OS X - -on: - pull_request: - branches: - - depends - paths: - - 'depends/**' - push: - branches: - - depends - paths: - - 'depends/**' - -env: - OS: osx - SCRIPTS: ${{ GITHUB.WORKSPACE }}/.github/scripts - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - name: Checkout the Code - uses: actions/checkout@v1 - - - name: Install Build Tools - run: sudo ${SCRIPTS}/00-install-deps.sh ${OS} - - - name: Copy the Xcode Dependency Files - run: | - cd ${{ GITHUB.WORKSPACE }} - curl -O https://raven-build-resources.s3.amazonaws.com/osx/MacOSX10.11.sdk.tar.gz - - - name: Extract Xcode Resources - run: | - mkdir -p ${{ GITHUB.WORKSPACE }}/depends/SDKs - cd ${{ GITHUB.WORKSPACE }}/depends/SDKs && tar -zxf ${{ GITHUB.WORKSPACE }}/MacOSX10.11.sdk.tar.gz - - - name: Build the Dependencies - run: cd ${{ GITHUB.WORKSPACE }}/depends && make HOST=x86_64-apple-darwin14 -j2 - - - name: Tar Up the Dependencies - run: | - if [[ ! -e ${{ GITHUB.WORKSPACE }}/depends_temp ]]; then mkdir -p ${{ GITHUB.WORKSPACE }}/depends_temp; fi - cd ${{ GITHUB.WORKSPACE }}/depends && tar zcf ${{ GITHUB.WORKSPACE }}/depends_temp/raven-osx-dependencies.tar.gz . - cd ${{ GITHUB.WORKSPACE }}/depends_temp - if [[ -e raven-osx-dependencies.tar.gz ]]; then sha256sum raven-osx-dependencies.tar.gz > SHASUM; else echo "no dependency tar file found"; fi - - - name: Sync the Dependencies to S3 - uses: jakejarvis/s3-sync-action@master - with: - args: --acl public-read --follow-symlinks - env: - SOURCE_DIR: "${{ GITHUB.WORKSPACE }}/depends_temp/" - DEST_DIR: 'osx' - AWS_REGION: 'us-east-1' - AWS_S3_BUCKET: "raven-build-resources" - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/dependencies-windows.yml b/.github/workflows/dependencies-windows.yml deleted file mode 100644 index 56ad93472a..0000000000 --- a/.github/workflows/dependencies-windows.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Dependencies - Windows - -on: - pull_request: - branches: - - depends - paths: - - 'depends/**' - push: - branches: - - depends - paths: - - 'depends/**' - -env: - OS: windows - SCRIPTS: ${{ GITHUB.WORKSPACE }}/.github/scripts - -jobs: - build: - - runs-on: ubuntu-latest - - - steps: - - name: Checkout the Code - uses: actions/checkout@v1 - - - name: Install Build Tools - run: sudo ${SCRIPTS}/00-install-deps.sh ${OS} - - - name: Build the Dependencies - run: | - cd ${{ GITHUB.WORKSPACE }}/depends - make HOST=x86_64-w64-mingw32 -j2 - - - name: Tar Up the Dependencies - run: | - if [[ ! -e ${{ GITHUB.WORKSPACE }}/depends_temp ]]; then mkdir -p ${{ GITHUB.WORKSPACE }}/depends_temp; fi - cd ${{ GITHUB.WORKSPACE }}/depends && tar zcf ${{ GITHUB.WORKSPACE }}/depends_temp/raven-windows-dependencies.tar.gz . - cd ${{ GITHUB.WORKSPACE }}/depends_temp - if [[ -e raven-windows-dependencies.tar.gz ]]; then sha256sum raven-windows-dependencies.tar.gz > SHASUM; else echo "no dependency tar file found"; fi - - - name: Sync the Dependencies to S3 - uses: jakejarvis/s3-sync-action@master - with: - args: --acl public-read --follow-symlinks - env: - SOURCE_DIR: "${{ GITHUB.WORKSPACE }}/depends_temp/" - DEST_DIR: 'windows' - AWS_REGION: 'us-east-1' - AWS_S3_BUCKET: "raven-build-resources" - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 31e60fcd6a..12dd7e657e 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -1,6 +1,7 @@ PACKAGE=qt $(package)_version=5.12.11 -$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules +#$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules +$(package)_download_path=https://download.qt.io/archive/qt/5.12/$($(package)_version)/submodules $(package)_suffix=everywhere-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) $(package)_sha256_hash=1c1b4e33137ca77881074c140d54c3c9747e845a31338cfe8680f171f0bc3a39