diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e32148c06fc..d97393761ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,147 +102,3 @@ jobs: signer_docker_tag: ${{ needs.check-release.outputs.signer_docker_tag }} is_node_release: ${{ needs.check-release.outputs.is_node_release }} is_signer_release: ${{ needs.check-release.outputs.is_signer_release }} - secrets: inherit - - ## Build and push Debian image built from source - ## - ## Runs when: - ## - it is not a node or signer-only release run - docker-image: - if: | - needs.check-release.outputs.is_node_release != 'true' || - needs.check-release.outputs.is_signer_release != 'true' - name: Docker Image (Source) - uses: ./.github/workflows/image-build-source.yml - needs: - - rustfmt - - check-release - secrets: inherit - - ## Create a reusable cache for tests - ## - ## Runs when: - ## - it is a node release run - ## or any of: - ## - this workflow is called manually - ## - PR is opened - ## - PR added to merge queue - create-cache: - if: | - needs.check-release.outputs.is_node_release == 'true' || - github.event_name == 'workflow_dispatch' || - github.event_name == 'pull_request' || - github.event_name == 'merge_group' - name: Create Test Cache - needs: - - rustfmt - - check-release - uses: ./.github/workflows/create-cache.yml - - ## Tests to run regularly - ## - ## Runs when: - ## - it is a node or signer-only release run - ## or any of: - ## - this workflow is called manually - ## - PR is opened - ## - PR added to merge queue - stacks-core-tests: - if: | - needs.check-release.outputs.is_node_release == 'true' || - needs.check-release.outputs.is_signer_release == 'true' || - github.event_name == 'workflow_dispatch' || - github.event_name == 'pull_request' || - github.event_name == 'merge_group' - name: Stacks Core Tests - needs: - - rustfmt - - create-cache - - check-release - uses: ./.github/workflows/stacks-core-tests.yml - - ## Checks to run on built binaries - ## - ## Runs when: - ## - it is a node or signer-only release run - ## or any of: - ## - this workflow is called manually - ## - PR is opened - ## - PR added to merge queue - stacks-core-build-tests: - if: | - needs.check-release.outputs.is_node_release == 'true' || - needs.check-release.outputs.is_signer_release == 'true' || - github.event_name == 'workflow_dispatch' || - github.event_name == 'pull_request' || - github.event_name == 'merge_group' - name: Stacks Core Build Tests - needs: - - rustfmt - - check-release - uses: ./.github/workflows/core-build-tests.yml - - ## Checks to run on built binaries - ## - ## Runs when: - ## - it is a node release run - ## or any of: - ## - this workflow is called manually - ## - PR is opened - ## - PR added to merge queue - bitcoin-tests: - if: | - needs.check-release.outputs.is_node_release == 'true' || - github.event_name == 'workflow_dispatch' || - github.event_name == 'pull_request' || - github.event_name == 'merge_group' - name: Bitcoin Tests - needs: - - rustfmt - - create-cache - - check-release - uses: ./.github/workflows/bitcoin-tests.yml - - p2p-tests: - if: | - needs.check-release.outputs.is_node_release == 'true' || - github.event_name == 'workflow_dispatch' || - github.event_name == 'pull_request' || - github.event_name == 'merge_group' - name: P2P Tests - needs: - - rustfmt - - create-cache - - check-release - uses: ./.github/workflows/p2p-tests.yml - - ## Test to run on a tagged release - ## - ## Runs when: - ## - it is a node release run - atlas-tests: - if: needs.check-release.outputs.is_node_release == 'true' - name: Atlas Tests - needs: - - rustfmt - - create-cache - - check-release - uses: ./.github/workflows/atlas-tests.yml - - epoch-tests: - if: needs.check-release.outputs.is_node_release == 'true' - name: Epoch Tests - needs: - - rustfmt - - create-cache - - check-release - uses: ./.github/workflows/epoch-tests.yml - - slow-tests: - if: needs.check-release.outputs.is_node_release == 'true' - name: Slow Tests - needs: - - rustfmt - - create-cache - - check-release - uses: ./.github/workflows/slow-tests.yml diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 75155649b6e..b796f36bee0 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -29,9 +29,6 @@ on: description: "True if it is a signer release" required: true type: string - secrets: - GH_TOKEN: - required: true concurrency: group: github-release-${{ github.head_ref || github.ref }} @@ -95,6 +92,8 @@ jobs: runs-on: ubuntu-latest needs: - build-binaries + permissions: + contents: write steps: ## Creates releases - name: Create Release @@ -106,7 +105,7 @@ jobs: signer_docker_tag: ${{ inputs.signer_docker_tag }} is_node_release: ${{ inputs.is_node_release }} is_signer_release: ${{ inputs.is_signer_release }} - GH_TOKEN: ${{ secrets.GH_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} ## Builds arch dependent Docker images from binaries @@ -114,36 +113,36 @@ jobs: ## Note: this step requires the binaries in the create-release step to be uploaded ## Runs when the following is true: ## - either node or signer tag is provided - docker-image: - if: | - inputs.node_tag != '' || - inputs.signer_tag != '' - name: Docker Image (Binary) - runs-on: ubuntu-latest - needs: - - build-binaries - - create-release - strategy: - fail-fast: false - ## Build a maximum of 2 images concurrently based on matrix.dist - max-parallel: 2 - matrix: - dist: - - alpine - - debian - steps: - - name: Create Docker Image - uses: stacks-network/actions/stacks-core/release/docker-images@main - with: - node_tag: ${{ inputs.node_tag }} - node_docker_tag: ${{ inputs.node_docker_tag }} - signer_tag: ${{ inputs.signer_tag }} - signer_docker_tag: ${{ inputs.signer_docker_tag }} - is_node_release: ${{ inputs.is_node_release }} - is_signer_release: ${{ inputs.is_signer_release }} - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - dist: ${{ matrix.dist }} + # docker-image: + # if: | + # inputs.node_tag != '' || + # inputs.signer_tag != '' + # name: Docker Image (Binary) + # runs-on: ubuntu-latest + # needs: + # - build-binaries + # - create-release + # strategy: + # fail-fast: false + # ## Build a maximum of 2 images concurrently based on matrix.dist + # max-parallel: 2 + # matrix: + # dist: + # - alpine + # - debian + # steps: + # - name: Create Docker Image + # uses: stacks-network/actions/stacks-core/release/docker-images@main + # with: + # node_tag: ${{ inputs.node_tag }} + # node_docker_tag: ${{ inputs.node_docker_tag }} + # signer_tag: ${{ inputs.signer_tag }} + # signer_docker_tag: ${{ inputs.signer_docker_tag }} + # is_node_release: ${{ inputs.is_node_release }} + # is_signer_release: ${{ inputs.is_signer_release }} + # DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + # DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} + # dist: ${{ matrix.dist }} ## Create the downstream PR for the release branch to master,develop create-pr: @@ -155,10 +154,12 @@ jobs: needs: - build-binaries - create-release - - docker-image + # - docker-image + permissions: + pull-requests: write steps: - name: Open Downstream PR id: create-pr uses: stacks-network/actions/stacks-core/release/downstream-pr@main with: - token: ${{ secrets.GH_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/versions.toml b/versions.toml index 138c89c7173..d33360ad171 100644 --- a/versions.toml +++ b/versions.toml @@ -1,4 +1,4 @@ # Update these values when a new release is created. # `stacks-common/build.rs` will automatically update `versions.rs` with these values. -stacks_node_version = "3.1.0.0.7" -stacks_signer_version = "3.1.0.0.7.0" +stacks_node_version = "6.3.0.0.0" +stacks_signer_version = "6.3.0.0.0.2"