Skip to content

Commit

Permalink
fix(CI): tools (azerothcore#19453)
Browse files Browse the repository at this point in the history
* fix(CI): tools

* Update tools_build.yml

* I dont think this is neccessary. Let's see if CI agrees with me
  • Loading branch information
Kitzunu authored Jul 20, 2024
1 parent 21f86d1 commit b9136e0
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 36 deletions.
11 changes: 6 additions & 5 deletions .github/actions/linux-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ inputs:
description: Flag to install modules or not
required: true
type: boolean
tools:
default: none
description: Flag to enable tools build
required: false
type: string
pch:
default: false
description: Flag to enable or disable PCH
Expand Down Expand Up @@ -94,7 +99,7 @@ runs:
cmake "$GITHUB_WORKSPACE" \
-DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/env/dist" \
-DAPPS_BUILD="all" \
-DTOOLS_BUILD="all" \
-DTOOLS_BUILD=${{ inputs.tools }} \
-DSCRIPTS="static" \
-DMODULES="static" \
-DWITH_WARNINGS="ON" \
Expand Down Expand Up @@ -144,10 +149,6 @@ runs:
shell: bash
run: sudo systemctl start mysql.service

- name: run dbimport
shell: bash
run: env/dist/bin/dbimport

- name: Dry run authserver
shell: bash
run: timeout 5m env/dist/bin/authserver --dry-run
Expand Down
46 changes: 15 additions & 31 deletions .github/workflows/tools_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,24 @@ concurrency:
jobs:
build:
strategy:
fail-fast: false
fail-fast: true
matrix:
# the result of the matrix will be the combination of all attributes, so we get os*compiler builds
os: [ubuntu-24.04]
compiler: [clang]
include:
- os: ubuntu-24.04
compiler:
CC: clang-18
CXX: clang++-18
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }}-${{ matrix.compiler }}
env:
COMPILER: ${{ matrix.compiler }}
name: ${{ matrix.os }}-${{ matrix.compiler.CC }}
if: |
github.repository == 'azerothcore/azerothcore-wotlk' && !github.event.pull_request.draft
&& (
contains(github.event.pull_request.labels.*.name, 'run-build')
|| github.event.label.name == 'run-build'
)
github.repository == 'azerothcore/azerothcore-wotlk'
&& !github.event.pull_request.draft
&& (github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'run-build') || github.event.label.name == 'run-build')
steps:
- uses: actions/checkout@v4
- name: Cache
uses: actions/cache@v4
env:
cache-name: cache-tools
- uses: ./.github/actions/linux-build
with:
path: var/ccache
key: ${{ env.cache-name }}-${{ matrix.os }}-${{ matrix.compiler }}-${{ github.ref }}-${{ github.sha }}
restore-keys: |
${{ env.cache-name }}-${{ matrix.os }}-${{ matrix.compiler }}-${{ github.ref }}-
${{ env.cache-name }}-${{ matrix.os }}-${{ matrix.compiler }}-
${{ env.cache-name }}-${{ matrix.os }}-
- name: Configure OS
run: source ./acore.sh install-deps
env:
CONTINUOUS_INTEGRATION: true
- name: Create conf/config.sh
run: source ./apps/ci/ci-conf-tools.sh
- name: Build
run: source ./apps/ci/ci-compile.sh

CC: ${{ matrix.compiler.CC }}
CXX: ${{ matrix.compiler.CXX }}
tools: all
pch: false

0 comments on commit b9136e0

Please sign in to comment.