Merge pull request #3185 from eduar-hte/git-describe

Simplify checkout of submodules in GitHub workflows (with support for git describe)
This commit is contained in:
Ervin Hegedus 2024-07-25 18:10:52 +02:00 committed by GitHub
commit adba86e2bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -57,11 +57,9 @@ jobs:
sudo apt-get install -y libgeoip-dev:${{ matrix.platform.arch }} \ sudo apt-get install -y libgeoip-dev:${{ matrix.platform.arch }} \
libfuzzy-dev:${{ matrix.platform.arch }} libfuzzy-dev:${{ matrix.platform.arch }}
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: get submodules with:
# get submodules manually for git describe to work during build submodules: true
run: | fetch-depth: 0
git submodule init
git submodule update
- name: build.sh - name: build.sh
run: ./build.sh run: ./build.sh
- name: configure - name: configure
@ -108,11 +106,9 @@ jobs:
bison \ bison \
flex flex
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: get submodules with:
# get submodules manually for git describe to work during build submodules: true
run: | fetch-depth: 0
git submodule init
git submodule update
- name: build.sh - name: build.sh
run: ./build.sh run: ./build.sh
- name: configure - name: configure
@ -141,11 +137,9 @@ jobs:
- {label: "wo libxml", opt: "-WITHOUT_LIBXML2=ON" } - {label: "wo libxml", opt: "-WITHOUT_LIBXML2=ON" }
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Get submodules with:
# get submodules manually for git describe to work during build submodules: true
run: | fetch-depth: 0
git submodule init
git submodule update
- name: Install Conan - name: Install Conan
run: | run: |
pip3 install conan --upgrade pip3 install conan --upgrade
@ -188,10 +182,11 @@ jobs:
run: | run: |
sudo apt-get update -y -qq sudo apt-get update -y -qq
sudo apt-get install -y cppcheck sudo apt-get install -y cppcheck
- name: Get libModSecurity v3 source - name: Checkout source
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: true submodules: true
fetch-depth: 0
- name: Configure libModSecurity - name: Configure libModSecurity
run: | run: |
./build.sh ./build.sh