From 68a647f670bd2d2819a47cb02b1a9e84519edb19 Mon Sep 17 00:00:00 2001 From: Felix Brucker <felix@felixbrucker.com> Date: Fri, 13 May 2022 19:28:23 +0200 Subject: [PATCH] Fix ci workflows --- .../workflows/build-linux-installer-deb.yml | 33 ---------------- .../workflows/build-linux-installer-rpm.yml | 39 ++----------------- .github/workflows/build-macos-installer.yml | 24 ------------ .github/workflows/build-windows-installer.yml | 37 ------------------ pyproject.toml | 2 +- 5 files changed, 4 insertions(+), 131 deletions(-) diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index cf81c3aa3bef..d69d02bd29bc 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -168,26 +168,6 @@ jobs: name: chia-installers-linux-deb-intel path: ${{ github.workspace }}/build_scripts/final_installer/ - - name: Configure AWS Credentials - if: steps.check_secrets.outputs.HAS_SECRET - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.INSTALLER_UPLOAD_KEY }} - aws-secret-access-key: ${{ secrets.INSTALLER_UPLOAD_SECRET }} - aws-region: us-west-2 - - - name: Upload to s3 - if: steps.check_secrets.outputs.HAS_SECRET - env: - CHIA_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }} - run: | - GIT_SHORT_HASH=$(echo "${GITHUB_SHA}" | cut -c1-8) - CHIA_DEV_BUILD=${CHIA_INSTALLER_VERSION}-$GIT_SHORT_HASH - echo "CHIA_DEV_BUILD=$CHIA_DEV_BUILD" >>$GITHUB_ENV - ls ${{ github.workspace }}/build_scripts/final_installer/ - aws s3 cp ${{ github.workspace }}/build_scripts/final_installer/chia-blockchain_${CHIA_INSTALLER_VERSION}_amd64.deb s3://download.chia.net/dev/chia-blockchain_${CHIA_DEV_BUILD}_amd64.deb - aws s3 cp ${{ github.workspace }}/build_scripts/final_installer/chia-blockchain-cli_${CHIA_INSTALLER_VERSION}-1_amd64.deb s3://download.chia.net/dev/chia-blockchain-cli_${CHIA_DEV_BUILD}-1_amd64.deb - - name: Create Checksums if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' env: @@ -198,16 +178,3 @@ jobs: sha256sum ${{ github.workspace }}/build_scripts/final_installer/chia-blockchain-cli_${CHIA_INSTALLER_VERSION}-1_amd64.deb > ${{ github.workspace }}/build_scripts/final_installer/chia-blockchain-cli_${CHIA_INSTALLER_VERSION}-1_amd64.deb.sha256 ls ${{ github.workspace }}/build_scripts/final_installer/ - - name: Install py3createtorrent - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' - run: | - pip3 install py3createtorrent - - - name: Create .deb torrent - env: - CHIA_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }} - if: startsWith(github.ref, 'refs/tags/') - run: | - py3createtorrent -f -t udp://tracker.opentrackr.org:1337/announce ${{ github.workspace }}/build_scripts/final_installer/chia-blockchain_${CHIA_INSTALLER_VERSION}_amd64.deb -o ${{ github.workspace }}/build_scripts/final_installer/chia-blockchain_${CHIA_INSTALLER_VERSION}_amd64.deb.torrent --webseed https://download.chia.net/install/chia-blockchain_${CHIA_INSTALLER_VERSION}_amd64.deb - py3createtorrent -f -t udp://tracker.opentrackr.org:1337/announce ${{ github.workspace }}/build_scripts/final_installer/chia-blockchain-cli_${CHIA_INSTALLER_VERSION}-1_amd64.deb -o ${{ github.workspace }}/build_scripts/final_installer/chia-blockchain-cli_${CHIA_INSTALLER_VERSION}-1_amd64.deb.torrent --webseed https://download.chia.net/install/chia-blockchain-cli_${CHIA_INSTALLER_VERSION}-1_amd64.deb - ls diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index c27bf335c3fc..f50497bdbf52 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -131,46 +131,13 @@ jobs: name: chia-installers-linux-rpm-intel path: ${{ github.workspace }}/build_scripts/final_installer/ - - name: Configure AWS Credentials - if: steps.check_secrets.outputs.HAS_SECRET - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.INSTALLER_UPLOAD_KEY }} - aws-secret-access-key: ${{ secrets.INSTALLER_UPLOAD_SECRET }} - aws-region: us-west-2 - - - name: Upload to s3 - if: steps.check_secrets.outputs.HAS_SECRET - env: - CHIA_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION_NORMALIZED }} - run: | - GIT_SHORT_HASH=$(echo "${GITHUB_SHA}" | cut -c1-8) - CHIA_DEV_BUILD=${CHIA_INSTALLER_VERSION}-$GIT_SHORT_HASH - echo "CHIA_DEV_BUILD=$CHIA_DEV_BUILD" >>$GITHUB_ENV - ls $GITHUB_WORKSPACE/build_scripts/final_installer/ - aws s3 cp $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm s3://download.chia.net/dev/chia-blockchain-${CHIA_DEV_BUILD}-1.x86_64.rpm - aws s3 cp $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-cli-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm s3://download.chia.net/dev/chia-blockchain-cli-${CHIA_DEV_BUILD}-1.x86_64.rpm - - name: Create Checksums if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' env: - CHIA_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION_NORMALIZED }} + CHIA_INSTALLER_VERSION_NORMALIZED: ${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION_NORMALIZED }} + CHIA_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }} run: | ls $GITHUB_WORKSPACE/build_scripts/final_installer/ - sha256sum $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm > $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm.sha256 + sha256sum $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-${CHIA_INSTALLER_VERSION_NORMALIZED}-1.x86_64.rpm > $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-${CHIA_INSTALLER_VERSION_NORMALIZED}-1.x86_64.rpm.sha256 sha256sum $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-cli-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm > $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-cli-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm.sha256 ls $GITHUB_WORKSPACE/build_scripts/final_installer/ - - - name: Install py3createtorrent - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' - run: | - pip3 install py3createtorrent - - - name: Create .rpm torrent - if: startsWith(github.ref, 'refs/tags/') - env: - CHIA_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION_NORMALIZED }} - run: | - py3createtorrent -f -t udp://tracker.opentrackr.org:1337/announce $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm -o $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm.torrent --webseed https://download.chia.net/install/chia-blockchain-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm - py3createtorrent -f -t udp://tracker.opentrackr.org:1337/announce $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-cli-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm -o $GITHUB_WORKSPACE/build_scripts/final_installer/chia-blockchain-cli-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm.torrent --webseed https://download.chia.net/install/chia-blockchain-cli-${CHIA_INSTALLER_VERSION}-1.x86_64.rpm - ls diff --git a/.github/workflows/build-macos-installer.yml b/.github/workflows/build-macos-installer.yml index e0dbfb51a696..fdb3008e8aae 100644 --- a/.github/workflows/build-macos-installer.yml +++ b/.github/workflows/build-macos-installer.yml @@ -158,27 +158,3 @@ jobs: run: | ls shasum -a 256 ${{ github.workspace }}/build_scripts/final_installer/Chia-${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}.dmg > ${{ github.workspace }}/build_scripts/final_installer/Chia-${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}.dmg.sha256 - - - name: Upload to s3 - if: steps.check_secrets.outputs.HAS_AWS_SECRET - env: - AWS_ACCESS_KEY_ID: ${{ secrets.INSTALLER_UPLOAD_KEY }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.INSTALLER_UPLOAD_SECRET }} - AWS_REGION: us-west-2 - CHIA_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }} - run: | - GIT_SHORT_HASH=$(echo "${GITHUB_SHA}" | cut -c1-8) - CHIA_DEV_BUILD=${CHIA_INSTALLER_VERSION}-$GIT_SHORT_HASH - echo "CHIA_DEV_BUILD=$CHIA_DEV_BUILD" >>$GITHUB_ENV - aws s3 cp ${{ github.workspace }}/build_scripts/final_installer/Chia-${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}.dmg s3://download.chia.net/dev/Chia-${CHIA_DEV_BUILD}.dmg - - - name: Install py3createtorrent - if: startsWith(github.ref, 'refs/tags/') - run: | - pip install py3createtorrent - - - name: Create torrent - if: startsWith(github.ref, 'refs/tags/') - run: | - py3createtorrent -f -t udp://tracker.opentrackr.org:1337/announce ${{ github.workspace }}/build_scripts/final_installer/Chia-${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}.dmg -o ${{ github.workspace }}/build_scripts/final_installer/Chia-${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}.dmg.torrent --webseed https://download.chia.net/install/Chia-${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}.dmg - ls ${{ github.workspace }}/build_scripts/final_installer/ diff --git a/.github/workflows/build-windows-installer.yml b/.github/workflows/build-windows-installer.yml index 5100bb815df6..56830d186590 100644 --- a/.github/workflows/build-windows-installer.yml +++ b/.github/workflows/build-windows-installer.yml @@ -167,46 +167,9 @@ jobs: name: Windows-Installers path: ${{ github.workspace }}\chia-blockchain-gui\release-builds\ - - name: Install AWS CLI - if: steps.check_secrets.outputs.HAS_AWS_SECRET - run: | - msiexec.exe /i https://awscli.amazonaws.com/AWSCLIV2.msi - - - name: Configure AWS Credentials - if: steps.check_secrets.outputs.HAS_AWS_SECRET - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.INSTALLER_UPLOAD_KEY }} - aws-secret-access-key: ${{ secrets.INSTALLER_UPLOAD_SECRET }} - aws-region: us-west-2 - - - name: Upload to s3 - if: steps.check_secrets.outputs.HAS_AWS_SECRET - env: - CHIA_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }} - shell: bash - run: | - GIT_SHORT_HASH=$(echo "${GITHUB_SHA}" | cut -c1-8) - CHIA_DEV_BUILD=${CHIA_INSTALLER_VERSION}-$GIT_SHORT_HASH - echo ::set-output name=CHIA_DEV_BUILD::${CHIA_DEV_BUILD} - echo ${CHIA_DEV_BUILD} - pwd - aws s3 cp chia-blockchain-gui/release-builds/windows-installer/ChiaSetup-${CHIA_INSTALLER_VERSION}.exe s3://download.chia.net/dev/ChiaSetup-${CHIA_DEV_BUILD}.exe - - name: Create Checksums env: CHIA_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }} run: | certutil.exe -hashfile ${{ github.workspace }}\chia-blockchain-gui\release-builds\windows-installer\ChiaSetup-${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}.exe SHA256 > ${{ github.workspace }}\chia-blockchain-gui\release-builds\windows-installer\ChiaSetup-${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}.exe.sha256 ls ${{ github.workspace }}\chia-blockchain-gui\release-builds\windows-installer\ - - - name: Install py3createtorrent - if: startsWith(github.ref, 'refs/tags/') - run: | - pip3 install py3createtorrent - - - name: Create torrent - if: startsWith(github.ref, 'refs/tags/') - run: | - py3createtorrent -f -t udp://tracker.opentrackr.org:1337/announce ${{ github.workspace }}\chia-blockchain-gui\release-builds\windows-installer\ChiaSetup-${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}.exe -o ${{ github.workspace }}\chia-blockchain-gui\release-builds\windows-installer\ChiaSetup-${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}.exe.torrent --webseed https://download.chia.net/install/ChiaSetup-${{ steps.version_number.outputs.CHIA_INSTALLER_VERSION }}.exe - ls diff --git a/pyproject.toml b/pyproject.toml index d2998898b4fc..7d451ce0f541 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=42", "wheel", "pip"] +requires = ["setuptools>=42", "wheel"] [tool.black] line-length = 120