Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed dependency review in merge queue push #3527

Merged
merged 7 commits into from
Apr 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions .github/workflows/build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -555,14 +561,15 @@ jobs:
with:
command: nix -- build .#docs-static
working-directory: ./docs

- name: Deploy docs
uses: FirebaseExtended/action-hosting-deploy@0f248036885ae672f78587669fa2923f0ef6cac2
with:
firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_DOCS_COMPOSABLE_FINANCE }}
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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
5 changes: 5 additions & 0 deletions terraform/github.com/team.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down