Skip to content

Commit 3d0eb91

Browse files
committed
Fix yamls to make yamllint happy.
Used a combination of yamlfix (https://github.com/lyz-code/yamlfix), prettier (https://github.com/prettier/prettier) and manual changes, as well as changes to generate-semaphore-yaml.sh (mostly for indentation).
1 parent a6e6e54 commit 3d0eb91

File tree

233 files changed

+113117
-139822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+113117
-139822
lines changed

.github/workflows/codeql.yml

+46-46
Original file line numberDiff line numberDiff line change
@@ -34,54 +34,54 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
include:
37-
#- language: c-cpp
38-
# build-mode: autobuild
39-
- language: go
40-
build-mode: autobuild
41-
- language: python
42-
build-mode: none
43-
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
44-
# Use `c-cpp` to analyze code written in C, C++ or both
45-
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
46-
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
47-
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
48-
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
49-
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
50-
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
37+
#- language: c-cpp
38+
# build-mode: autobuild
39+
- language: go
40+
build-mode: autobuild
41+
- language: python
42+
build-mode: none
43+
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
44+
# Use `c-cpp` to analyze code written in C, C++ or both
45+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
46+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
47+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
48+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
49+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
50+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
5151
steps:
52-
- name: Checkout repository
53-
uses: actions/checkout@v4
52+
- name: Checkout repository
53+
uses: actions/checkout@v4
5454

55-
# Initializes the CodeQL tools for scanning.
56-
- name: Initialize CodeQL
57-
uses: github/codeql-action/init@v3
58-
with:
59-
languages: ${{ matrix.language }}
60-
build-mode: ${{ matrix.build-mode }}
61-
# If you wish to specify custom queries, you can do so here or in a config file.
62-
# By default, queries listed here will override any specified in a config file.
63-
# Prefix the list here with "+" to use these queries and those in the config file.
55+
# Initializes the CodeQL tools for scanning.
56+
- name: Initialize CodeQL
57+
uses: github/codeql-action/init@v3
58+
with:
59+
languages: ${{ matrix.language }}
60+
build-mode: ${{ matrix.build-mode }}
61+
# If you wish to specify custom queries, you can do so here or in a config file.
62+
# By default, queries listed here will override any specified in a config file.
63+
# Prefix the list here with "+" to use these queries and those in the config file.
6464

65-
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
66-
# queries: security-extended,security-and-quality
65+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
66+
# queries: security-extended,security-and-quality
6767

68-
# If the analyze step fails for one of the languages you are analyzing with
69-
# "We were unable to automatically build your code", modify the matrix above
70-
# to set the build mode to "manual" for that language. Then modify this step
71-
# to build your code.
72-
# ℹ️ Command-line programs to run using the OS shell.
73-
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
74-
- if: matrix.build-mode == 'manual'
75-
shell: bash
76-
run: |
77-
echo 'If you are using a "manual" build mode for one or more of the' \
78-
'languages you are analyzing, replace this with the commands to build' \
79-
'your code, for example:'
80-
echo ' make bootstrap'
81-
echo ' make release'
82-
exit 1
68+
# If the analyze step fails for one of the languages you are analyzing with
69+
# "We were unable to automatically build your code", modify the matrix above
70+
# to set the build mode to "manual" for that language. Then modify this step
71+
# to build your code.
72+
# ℹ️ Command-line programs to run using the OS shell.
73+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
74+
- if: matrix.build-mode == 'manual'
75+
shell: bash
76+
run: |
77+
echo 'If you are using a "manual" build mode for one or more of the' \
78+
'languages you are analyzing, replace this with the commands to build' \
79+
'your code, for example:'
80+
echo ' make bootstrap'
81+
echo ' make release'
82+
exit 1
8383
84-
- name: Perform CodeQL Analysis
85-
uses: github/codeql-action/analyze@v3
86-
with:
87-
category: "/language:${{matrix.language}}"
84+
- name: Perform CodeQL Analysis
85+
uses: github/codeql-action/analyze@v3
86+
with:
87+
category: "/language:${{matrix.language}}"

.semaphore/cleanup.yml

+34-34
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,39 @@ execution_time_limit:
99
minutes: 10
1010

1111
blocks:
12-
- name: Clean up GCE resources
13-
dependencies: []
14-
task:
15-
prologue:
16-
commands:
17-
- checkout
18-
- export GOOGLE_APPLICATION_CREDENTIALS=$HOME/secrets/secret.google-service-account-key.json
19-
- export SHORT_WORKFLOW_ID=$(echo ${SEMAPHORE_WORKFLOW_ID} | sha256sum | cut -c -8)
20-
- export ZONE=europe-west3-c
21-
- export VM_PREFIX=sem-${SEMAPHORE_PROJECT_NAME}-${SHORT_WORKFLOW_ID}-
22-
- echo VM_PREFIX=${VM_PREFIX}
23-
jobs:
24-
- name: Clean up GCE instances
25-
commands:
26-
- cd felix
27-
- ./.semaphore/clean-up-vms ${VM_PREFIX}
28-
secrets:
29-
- name: google-service-account-for-gce
30-
31-
- name: Clean up windows resources
32-
dependencies: []
33-
task:
34-
prologue:
35-
commands:
36-
- checkout
37-
- az login --service-principal -u "${AZ_SP_ID}" -p "${AZ_SP_PASSWORD}" --tenant "${AZ_TENANT_ID}" --output none
38-
- cd process/testing/util
39-
jobs:
40-
- name: Clean up windows felix resources
12+
- name: Clean up GCE resources
13+
dependencies: []
14+
task:
15+
prologue:
4116
commands:
42-
- ./delete-az-rg.sh ${USER}-capz-win-felix-${SEMAPHORE_WORKFLOW_ID:0:8}-rg
43-
- name: Clean up windows cni resources
17+
- checkout
18+
- export GOOGLE_APPLICATION_CREDENTIALS=$HOME/secrets/secret.google-service-account-key.json
19+
- export SHORT_WORKFLOW_ID=$(echo ${SEMAPHORE_WORKFLOW_ID} | sha256sum | cut -c -8)
20+
- export ZONE=europe-west3-c
21+
- export VM_PREFIX=sem-${SEMAPHORE_PROJECT_NAME}-${SHORT_WORKFLOW_ID}-
22+
- echo VM_PREFIX=${VM_PREFIX}
23+
jobs:
24+
- name: Clean up GCE instances
25+
commands:
26+
- cd felix
27+
- ./.semaphore/clean-up-vms ${VM_PREFIX}
28+
secrets:
29+
- name: google-service-account-for-gce
30+
31+
- name: Clean up windows resources
32+
dependencies: []
33+
task:
34+
prologue:
4435
commands:
45-
- ./delete-az-rg.sh ${USER}-capz-win-cni-${SEMAPHORE_WORKFLOW_ID:0:8}-rg
46-
secrets:
47-
- name: banzai-secrets
36+
- checkout
37+
- az login --service-principal -u "${AZ_SP_ID}" -p "${AZ_SP_PASSWORD}" --tenant "${AZ_TENANT_ID}" --output none
38+
- cd process/testing/util
39+
jobs:
40+
- name: Clean up windows felix resources
41+
commands:
42+
- ./delete-az-rg.sh ${USER}-capz-win-felix-${SEMAPHORE_WORKFLOW_ID:0:8}-rg
43+
- name: Clean up windows cni resources
44+
commands:
45+
- ./delete-az-rg.sh ${USER}-capz-win-cni-${SEMAPHORE_WORKFLOW_ID:0:8}-rg
46+
secrets:
47+
- name: banzai-secrets

.semaphore/generate-semaphore-yaml.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ for out_file in semaphore.yml semaphore-scheduled-builds.yml; do
88
cat semaphore.yml.d/02-global_job_config.yml >>$out_file
99
cat semaphore.yml.d/03-promotions.yml >>$out_file
1010

11+
# use sed to properly indent blocks
1112
echo "blocks:" >>$out_file
12-
cat semaphore.yml.d/blocks/*.yml >>$out_file
13+
cat semaphore.yml.d/blocks/*.yml | sed -e 's/^./ &/' >>$out_file
14+
15+
cat semaphore.yml.d/99-after_pipeline.yml >>$out_file
1316
done
1417

1518
sed -i "s/\${FORCE_RUN}/false/g" semaphore.yml

0 commit comments

Comments
 (0)