Skip to content

Commit b29a222

Browse files
chore(CI): Fix daily CI (#832)
1 parent 8599fdf commit b29a222

6 files changed

Lines changed: 21 additions & 12 deletions

File tree

.github/workflows/daily_ci.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
# This workflow runs every weekday at 15:00 UTC (8AM PDT)
22
name: Daily CI
33

4+
permissions:
5+
contents: read
6+
47
on:
58
schedule:
69
- cron: "00 15 * * 1-5"
7-
8-
permissions:
9-
contents: read
10+
pull_request:
11+
paths:
12+
- .github/workflows/daily_ci.yml
1013

1114
jobs:
1215
codebuild:
13-
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
16+
if: github.event_name == 'pull_request' || github.repository_owner == 'aws'
17+
permissions:
18+
contents: read
19+
id-token: write
1420
uses: ./.github/workflows/codebuild.yml
1521
secrets: inherit
1622
notify:
1723
needs:
1824
[
1925
codebuild,
2026
]
21-
if: ${{ failure() }}
27+
if: ${{ failure() && github.event_name == 'schedule' }}
2228
uses: aws/aws-cryptographic-material-providers-library/.github/workflows/slack-notification.yml@main
2329
with:
2430
message: "Daily CI failed on `${{ github.repository }}`. View run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
# USAGE
1010
#
1111
# If you need to use different versions for tools like CBMC, modify this file:
12-
# .github/workflows/proof_ci_resources/config.yaml
12+
# .github/workflows/proof_ci_resources/config.yml
1313
#
1414
# If you want the CI to use a different GitHub-hosted runner (which must still
1515
# be running Ubuntu 20.04), modify the value of this key:
@@ -30,7 +30,7 @@ jobs:
3030
submodules: 'recursive'
3131
- name: Parse config file
3232
run: |
33-
CONFIG_FILE='.github/workflows/proof_ci_resources/config.yaml'
33+
CONFIG_FILE='.github/workflows/proof_ci_resources/config.yml'
3434
for setting in cadical-tag cbmc-version cbmc-viewer-version kissat-tag litani-version proofs-dir run-cbmc-proofs-command; do
3535
VAR=$(echo $setting | tr "[:lower:]" "[:upper:]" | tr - _)
3636
echo "${VAR}"=$(yq .$setting $CONFIG_FILE) >> $GITHUB_ENV
File renamed without changes.

.github/workflows/pull.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: ./.github/workflows/osx.yml
2020
secrets: inherit
2121
proof-ci:
22-
uses: ./.github/workflows/proof_ci.yaml
22+
uses: ./.github/workflows/proof_ci.yml
2323
secrets: inherit
2424
pr-ci-all-required:
2525
if: always()

.github/workflows/push.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ jobs:
1212
uses: ./.github/workflows/clang-format.yml
1313
secrets: inherit
1414
codebuild:
15+
permissions:
16+
contents: read
17+
id-token: write
1518
uses: ./.github/workflows/codebuild.yml
1619
secrets: inherit
1720
osx:
1821
uses: ./.github/workflows/osx.yml
1922
secrets: inherit
2023
proof-ci:
21-
uses: ./.github/workflows/proof_ci.yaml
24+
uses: ./.github/workflows/proof_ci.yml
2225
secrets: inherit

tests/TestVectors/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
test_vectors: *.cpp *.h
22
g++ -g -ggdb --std=c++17 -o test_vectors -I../../include/ \
3+
-Wl,-rpath,../../build-aws-encryption-sdk-c/Debug/ \
4+
-Wl,-rpath,../../build-aws-encryption-sdk-c/aws-encryption-sdk-cpp/Debug/ \
5+
-Wl,-rpath,../../install/lib/ \
36
base64.cpp do_decrypt.cpp do_encrypt.cpp parse_encrypt.cpp parse_keys.cpp test_vectors.cpp \
47
-I/opt/homebrew/include/ -L/opt/homebrew/lib/ \
58
-I../../install/include/ -L../../install/lib/ -I ../../aws-encryption-sdk-cpp/include/ \
69
../../build-aws-encryption-sdk-c/Debug/libaws-encryption-sdk.dylib \
710
../../build-aws-encryption-sdk-c/aws-encryption-sdk-cpp/Debug/libaws-encryption-sdk-cpp.dylib \
811
-laws-cpp-sdk-core -laws-cpp-sdk-kms -laws-c-common -lcrypto
9-
install_name_tool -add_rpath ../../build-aws-encryption-sdk-c/Debug/ test_vectors
10-
install_name_tool -add_rpath ../../build-aws-encryption-sdk-c/aws-encryption-sdk-cpp/Debug/ test_vectors
11-
install_name_tool -add_rpath ../../install/lib/ test_vectors
1212

1313
test_vectors_unix: *.cpp *.h
1414
g++ -g -ggdb --std=c++17 -o test_vectors -I../../include/ \

0 commit comments

Comments
 (0)