CI: Clean up formatting in GitHub Action definitions

This patch cleans up the formatting within the .yml definition files for GitHub
Actions to ensure a consistent look across all actions.
This commit is contained in:
Tim Duesterhus 2021-10-16 18:10:27 +02:00 committed by Willy Tarreau
parent 89c9d0a169
commit 662896e68e
5 changed files with 43 additions and 43 deletions

View File

@ -1,4 +1,4 @@
name: codespell name: Spelling Check
on: on:
schedule: schedule:
@ -9,12 +9,15 @@ permissions:
jobs: jobs:
codespell: codespell:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: install prerequisites - name: Install codespell
run: sudo pip install codespell run: sudo pip install codespell
- name: check - name: Run codespell
run: codespell -c -q 2 --ignore-words-list ist,ists,hist,wan,ca,cas,que,ans,te,nd,referer,ot,uint,iif,fo,keep-alives,dosen --skip="CHANGELOG,Makefile,*.fig,*.pem" run: |
codespell \
-c \
-q 2 \
--ignore-words-list ist,ists,hist,wan,ca,cas,que,ans,te,nd,referer,ot,uint,iif,fo,keep-alives,dosen \
--skip="CHANGELOG,Makefile,*.fig,*.pem"

View File

@ -3,7 +3,7 @@ name: Spec Compliance
on: on:
schedule: schedule:
- cron: "0 0 * * 3" - cron: "0 0 * * 3"
permissions: permissions:
contents: read contents: read

View File

@ -8,9 +8,7 @@ permissions:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Compile admin/halog/halog - name: Compile admin/halog/halog

View File

@ -1,6 +1,7 @@
name: alpine/musl name: alpine/musl
on: [push] on:
push:
permissions: permissions:
contents: read contents: read
@ -12,30 +13,30 @@ jobs:
container: container:
image: alpine:latest image: alpine:latest
steps: steps:
- uses: actions/checkout@master - uses: actions/checkout@master
- name: Install dependencies - name: Install dependencies
run: apk add gcc make tar git python3 libc-dev linux-headers pcre-dev pcre2-dev openssl-dev lua5.3-dev grep socat curl run: apk add gcc make tar git python3 libc-dev linux-headers pcre-dev pcre2-dev openssl-dev lua5.3-dev grep socat curl
- name: Install VTest - name: Install VTest
run: scripts/build-vtest.sh run: scripts/build-vtest.sh
- name: Build - name: Build
run: make -j$(nproc) CC=cc V=1 TARGET=linux-musl USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 USE_OPENSSL=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_PROMEX=1 run: make -j$(nproc) CC=cc V=1 TARGET=linux-musl USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 USE_OPENSSL=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_PROMEX=1
- name: Show version - name: Show version
run: ./haproxy -vv run: ./haproxy -vv
- name: Show linked libraries - name: Show linked libraries
run: ldd haproxy run: ldd haproxy
- name: Install problem matcher for VTest - name: Install problem matcher for VTest
# This allows one to more easily see which tests fail. # This allows one to more easily see which tests fail.
run: echo "::add-matcher::.github/vtest.json" run: echo "::add-matcher::.github/vtest.json"
- name: Run VTest - name: Run VTest
id: vtest id: vtest
run: make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel run: make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel
- name: Show results - name: Show results
if: ${{ failure() }} if: ${{ failure() }}
run: | run: |
for folder in /tmp/haregtests-*/vtc.*; do for folder in /tmp/haregtests-*/vtc.*; do
printf "::group::" printf "::group::"
cat $folder/INFO cat $folder/INFO
cat $folder/LOG cat $folder/LOG
echo "::endgroup::" echo "::endgroup::"
done done
shopt -s nullglob shopt -s nullglob

View File

@ -12,24 +12,22 @@ name: openssl no-deprecated
on: on:
schedule: schedule:
- cron: "0 0 * * 4" - cron: "0 0 * * 4"
permissions: permissions:
contents: read contents: read
jobs: jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: prepare VTest - name: Install VTest
run: | run: |
scripts/build-vtest.sh scripts/build-vtest.sh
- name: build haproxy - name: Compile HAProxy
run: | run: |
make DEFINE="-DOPENSSL_API_COMPAT=0x10100000L -DOPENSSL_NO_DEPRECATED" -j3 CC=gcc ERR=1 TARGET=linux-glibc USE_OPENSSL=1 make DEFINE="-DOPENSSL_API_COMPAT=0x10100000L -DOPENSSL_NO_DEPRECATED" -j3 CC=gcc ERR=1 TARGET=linux-glibc USE_OPENSSL=1
- name: run reg-tests - name: Run VTest
run: | run: |
make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel