diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 2470493eac0..d965f4d703c 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -34,7 +34,7 @@ env: jobs: dependency-review: - if: ${{ github.event_name != 'merge_group' }} + if: ${{ github.event_name != 'merge_group' && github.event_name != 'push' }} concurrency: group: ${{ github.workflow }}-dependency-review-${{ github.event.pull_request.title }} cancel-in-progress: true @@ -59,6 +59,8 @@ jobs: runs-on: ubuntu-latest steps: - run: | + echo ${{ github.event_name }} + echo ${{ github.ref_name }} echo "I am priviliged by goblins on repository id ${{ github.event.pull_request.head.repo.id }} ${{ github.event.pull_request_target.head.repo.id }}" lfs-check: @@ -503,23 +505,27 @@ jobs: name: "Effect gate, automatically merged if passed" runs-on: ubuntu-latest needs: - - dependency-review - - privilege-check - - lfs-check - - nix-flake-check + - build-all-benchmarks-packages - build-all-ci-packages - - build-all-platforms-arm - - build-all-misc-packages - build-all-docs-packages - - build-all-benchmarks-packages + - build-all-misc-packages + - build-all-platforms-arm - build-all-production-deps + - dependency-review + - lfs-check + - nix-flake-check + - privilege-check steps: - run: echo "See next activities of pushing and publishing and merging" deploy-docs: name: "Deploy docs" needs: - - effects-gate + - build-all-docs-packages + - build-all-misc-packages + - lfs-check + - nix-flake-check + - privilege-check runs-on: ubuntu-latest concurrency: group: ${{ github.workflow }}-deploy-docs-${{ github.event.pull_request.title }} @@ -555,6 +561,7 @@ jobs: with: command: nix -- build .#docs-static working-directory: ./docs + - name: Deploy docs uses: FirebaseExtended/action-hosting-deploy@0f248036885ae672f78587669fa2923f0ef6cac2 with: @@ -562,7 +569,7 @@ jobs: projectId: composable-docs entrypoint: docs/ # this must go same release flow as FE, not from main - channelId: ${{ github.event_name == 'push' && github.ref_name == 'main' }} + channelId: ${{ github.event_name == 'push' && github.ref_name == 'main' && 'live' }} # this should be split and commit docker are from here, but latest from release push-docker-images: diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 021dc069db7..c271464642a 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -90,7 +90,7 @@ jobs: fail_on_unmatched_files: true generate_release_notes: true body_path: release-artifacts/release.txt - name: ${{ github.ref_name }}-prerelease + name: ${{ github.ref_name }} tag_name: ${{ github.ref_name }} target_commitish: ${{ github.sha }} files: | diff --git a/terraform/github.com/team.tf b/terraform/github.com/team.tf index 09e46dcb58a..ed28aa4ce62 100644 --- a/terraform/github.com/team.tf +++ b/terraform/github.com/team.tf @@ -39,6 +39,11 @@ resource "github_repository_collaborators" "roles" { username = "JafarAz" } + user { + permission = "push" + username = "RustNinja" + } + team { permission = "admin" team_id = data.github_team.product.slug