Skip to content

Commit

Permalink
enable main ci for this branch temporarily, disable pull request ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Wumpf committed Mar 13, 2024
1 parent 442cc77 commit 2056560
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 22 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/on_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@

name: Pull-Request

# TODO: revert this
on:
pull_request:
types:
- opened
- synchronize
# pull_request:
# types:
# - opened
# - synchronize
push:
branches:
- "no"

# These jobs use fairly short names as they are a prefix in the display hierarchy
jobs:
Expand Down
29 changes: 15 additions & 14 deletions .github/workflows/on_push_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- "main"
- "andreas/cpp-arm64" # TODO: REMOVE!

jobs:
checks:
Expand All @@ -13,20 +14,20 @@ jobs:
CONCURRENCY: push-${{ github.ref_name }}
secrets: inherit

cpp_checks:
name: Checks
uses: ./.github/workflows/reusable_checks_cpp.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
FULL: "true"
secrets: inherit

rust_checks:
name: Checks
uses: ./.github/workflows/reusable_checks_rust.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
secrets: inherit
# cpp_checks:
# name: Checks
# uses: ./.github/workflows/reusable_checks_cpp.yml
# with:
# CONCURRENCY: push-${{ github.ref_name }}
# FULL: "true"
# secrets: inherit

# rust_checks:
# name: Checks
# uses: ./.github/workflows/reusable_checks_rust.yml
# with:
# CONCURRENCY: push-${{ github.ref_name }}
# secrets: inherit

# Check that a CLEAN container with just `cargo` on it can build rerun:
clean-build:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/reusable_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ jobs:
pip install gitignore_parser
pip install -r ./scripts/ci/requirements.txt
- name: Rerun lints
shell: bash
run: |
./scripts/lint.py
# - name: Rerun lints
# shell: bash
# run: |
# ./scripts/lint.py

# NOTE: We don't want spurious failures caused by issues being closed, so this does not run on CI,
# at least for the time being.
Expand Down

0 comments on commit 2056560

Please sign in to comment.