From e57cdcc0d95170fd30b60e52c03018143c5421ae Mon Sep 17 00:00:00 2001 From: Ted Date: Fri, 19 Jul 2024 16:55:22 -0400 Subject: [PATCH] Ignore ci.yaml and buildifier.yaml from rules-template (#77) --- .github/workflows/buildifier.yaml | 19 ------------------- .github/workflows/ci.yaml | 31 ------------------------------- update_github_workflows.sh | 4 ++++ 3 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 .github/workflows/buildifier.yaml delete mode 100644 .github/workflows/ci.yaml diff --git a/.github/workflows/buildifier.yaml b/.github/workflows/buildifier.yaml deleted file mode 100644 index 9a493c2..0000000 --- a/.github/workflows/buildifier.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: Buildifier - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the main branch - push: - branches: [main] - pull_request: - branches: [main] - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: buildifier - run: bazel run --enable_bzlmod //.github/workflows:buildifier.check diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml deleted file mode 100644 index fedfc76..0000000 --- a/.github/workflows/ci.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: CI - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the main branch - push: - branches: [main] - pull_request: - branches: [main] - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -concurrency: - # Cancel previous actions from the same PR or branch except 'main' branch. - # See https://docs.github.com/en/actions/using-jobs/using-concurrency and https://docs.github.com/en/actions/learn-github-actions/contexts for more info. - group: concurrency-group::${{ github.workflow }}::${{ github.event.pull_request.number > 0 && format('pr-{0}', github.event.pull_request.number) || github.ref_name }}${{ github.ref_name == 'main' && format('::{0}', github.run_id) || ''}} - cancel-in-progress: ${{ github.ref_name != 'main' }} - -jobs: - test: - uses: bazel-contrib/.github/.github/workflows/bazel.yaml@v6 - with: - folders: | - [ - ".", - "e2e/smoke" - ] - exclude: | - [ - {"folder": ".", "bzlmodEnabled": false} - ] diff --git a/update_github_workflows.sh b/update_github_workflows.sh index ed18e29..c51653f 100755 --- a/update_github_workflows.sh +++ b/update_github_workflows.sh @@ -31,6 +31,10 @@ function update_github_workflows() { # 'rules_mylang' for rules_android_ndk and write out the resulting file back to # rules_android_ndk/.github/workflows. for ci_file in $(ls); do + if [[ "$ci_file" == "ci.yaml" || "$ci_file" == "buildifier.yaml" ]]; then + # Don't need ci.yaml or buildifier.yaml for rules_android_ndk, since we've already set up BazelCI. + continue + fi sed "s/rules_mylang/rules_android_ndk/g" "$ci_file" > "$rules_android_ndk_workflows/$ci_file" done rm -rf $rules_template_dir