Skip to content

Commit

Permalink
Incorporate workflow check from main
Browse files Browse the repository at this point in the history
Signed-off-by: Spencer Wilson <[email protected]>
  • Loading branch information
SWilson4 committed Sep 13, 2024
1 parent 44916ea commit 86aff6b
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 18 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,19 @@ permissions:
on: [workflow_call, workflow_dispatch]

jobs:
workflowcheck:
name: Check validity of GitHub workflows
runs-on: ubuntu-latest
container: openquantumsafe/ci-ubuntu-latest:latest
steps:
- name: Checkout code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
- name: Ensure GitHub actions are valid
run: actionlint -shellcheck "" # run *without* shellcheck

check_clang_format:
name: "Coding style"
needs: [workflowcheck]
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/check_workflows.yml
Original file line number Diff line number Diff line change
@@ -1,14 +0,0 @@
name: Check GitHub workflows

on: [pull_request, push, workflow_call]

jobs:
workflowcheck:
name: Check validity of GitHub workflows
runs-on: ubuntu-latest
container: openquantumsafe/ci-ubuntu-latest:latest
steps:
- name: Checkout code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
- name: Ensure GitHub actions are valid
run: actionlint -shellcheck "" # run *without* shellcheck
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ jobs:
- name: Update container
run: apt update && apt install -y cmake ninja-build gcc libssl-dev git
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
- name: Full build
run: LIBOQS_BRANCH=main ./scripts/fullbuild.sh
- name: Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
- name: Install prerequisites
run: brew install liboqs
- name: Checkout oqsprovider code
uses: actions/checkout@v2
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
- name: Build and test oqsprovider
# try this only if brew'd liboqs knows about ML-KEM:
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ jobs:
&& echo "liboqs_ref=$liboqs_ref" >> "$GITHUB_ENV" \
|| echo "liboqs_ref=main" >> "$GITHUB_ENV"
- name: Checkout oqs-provider on requested ref if it exists; otherwise, fall back to main
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
with:
ref: ${{ env.provider_ref }}
- name: Checkout liboqs at requested ref if it exists; otherwise, fall back to main
uses: actions/checkout@v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
with:
repository: open-quantum-safe/liboqs
path: liboqs
Expand Down

0 comments on commit 86aff6b

Please sign in to comment.