This patch cleans up the formatting within the .yml definition files for GitHub
Actions to ensure a consistent look across all actions.
---
.github/workflows/codespell.yml | 15 +++---
.github/workflows/compliance.yml | 2 +-
.github/workflows/contrib.yml | 2 -
.github/workflows/musl.yml | 57 +++++++++++-----------
.github/workflows/openssl-nodeprecated.yml | 10 ++--
5 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index 61edaeb9e..955560a0a 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -1,4 +1,4 @@
-name: codespell
+name: Spelling Check
on:
schedule:
@@ -9,12 +9,15 @@ permissions:
jobs:
codespell:
-
runs-on: ubuntu-latest
-
steps:
- uses: actions/checkout@v2
- - name: install prerequisites
+ - name: Install codespell
run: sudo pip install codespell
- - name: check
- 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"
+ - 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"
diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml
index fe6c2711e..3ce717805 100644
--- a/.github/workflows/compliance.yml
+++ b/.github/workflows/compliance.yml
@@ -3,7 +3,7 @@ name: Spec Compliance
on:
schedule:
- - cron: "0 0 * * 3"
+ - cron: "0 0 * * 3"
permissions:
contents: read
diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml
index 93387a458..480f61be8 100644
--- a/.github/workflows/contrib.yml
+++ b/.github/workflows/contrib.yml
@@ -8,9 +8,7 @@ permissions:
jobs:
build:
-
runs-on: ubuntu-latest
-
steps:
- uses: actions/checkout@v2
- name: Compile admin/halog/halog
diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml
index 19d82af7c..c106b1d05 100644
--- a/.github/workflows/musl.yml
+++ b/.github/workflows/musl.yml
@@ -1,6 +1,7 @@
name: alpine/musl
-on: [push]
+on:
+ push:
permissions:
contents: read
@@ -12,30 +13,30 @@ jobs:
container:
image: alpine:latest
steps:
- - uses: actions/checkout@master
- - 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
- - name: Install VTest
- run: scripts/build-vtest.sh
- - 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
- - name: Show version
- run: ./haproxy -vv
- - name: Show linked libraries
- run: ldd haproxy
- - name: Install problem matcher for VTest
- # This allows one to more easily see which tests fail.
- run: echo "::add-matcher::.github/vtest.json"
- - name: Run VTest
- id: vtest
- run: make reg-tests VTEST_PROGRAM=../vtest/vtest
REGTESTS_TYPES=default,bug,devel
- - name: Show results
- if: ${{ failure() }}
- run: |
- for folder in /tmp/haregtests-*/vtc.*; do
- printf "::group::"
- cat $folder/INFO
- cat $folder/LOG
- echo "::endgroup::"
- done
- shopt -s nullglob
+ - uses: actions/checkout@master
+ - 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
+ - name: Install VTest
+ run: scripts/build-vtest.sh
+ - 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
+ - name: Show version
+ run: ./haproxy -vv
+ - name: Show linked libraries
+ run: ldd haproxy
+ - name: Install problem matcher for VTest
+ # This allows one to more easily see which tests fail.
+ run: echo "::add-matcher::.github/vtest.json"
+ - name: Run VTest
+ id: vtest
+ run: make reg-tests VTEST_PROGRAM=../vtest/vtest
REGTESTS_TYPES=default,bug,devel
+ - name: Show results
+ if: ${{ failure() }}
+ run: |
+ for folder in /tmp/haregtests-*/vtc.*; do
+ printf "::group::"
+ cat $folder/INFO
+ cat $folder/LOG
+ echo "::endgroup::"
+ done
+ shopt -s nullglob
diff --git a/.github/workflows/openssl-nodeprecated.yml
b/.github/workflows/openssl-nodeprecated.yml
index f6da38234..e62dbf0d8 100644
--- a/.github/workflows/openssl-nodeprecated.yml
+++ b/.github/workflows/openssl-nodeprecated.yml
@@ -12,24 +12,22 @@ name: openssl no-deprecated
on:
schedule:
- - cron: "0 0 * * 4"
+ - cron: "0 0 * * 4"
permissions:
contents: read
jobs:
test:
-
runs-on: ubuntu-latest
-
steps:
- uses: actions/checkout@v1
- - name: prepare VTest
+ - name: Install VTest
run: |
scripts/build-vtest.sh
- - name: build haproxy
+ - name: Compile HAProxy
run: |
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: |
make reg-tests VTEST_PROGRAM=../vtest/vtest
REGTESTS_TYPES=default,bug,devel
--
2.33.0
