Skip to content

Commit

Permalink
Merge PR mumble-voip#6494: MAINT(ci): Various maintenance work relate…
Browse files Browse the repository at this point in the history
…d to CI configs
  • Loading branch information
Krzmbrzl authored Jul 6, 2024
2 parents 4b20771 + b4796a9 commit 325e70e
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 33 deletions.
36 changes: 28 additions & 8 deletions .ci/azure-pipelines/install-environment_linux.bash
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,31 @@

sudo apt-get update

sudo apt-get -y install build-essential g++-multilib ninja-build pkg-config \
qt5-default qttools5-dev qttools5-dev-tools libqt5svg5-dev \
libboost-dev libssl-dev libprotobuf-dev protobuf-compiler libprotoc-dev \
libcap-dev libxi-dev \
libasound2-dev libasound2-plugins libasound2-plugins-extra\
libogg-dev libsndfile1-dev libopus-dev libspeechd-dev \
libavahi-compat-libdnssd-dev libzeroc-ice-dev \
zsync appstream libpoco-dev
sudo apt -y install \
build-essential \
g++-multilib \
ninja-build \
pkg-config \
qtbase5-dev \
qttools5-dev \
qttools5-dev-tools \
libqt5svg5-dev \
libboost-dev \
libssl-dev \
libprotobuf-dev \
protobuf-compiler \
libprotoc-dev \
libcap-dev \
libxi-dev \
libasound2-dev \
libasound2-plugins \
libasound2-plugins-extra \
libogg-dev \
libsndfile1-dev \
libopus-dev \
libspeechd-dev \
libavahi-compat-libdnssd-dev \
libzeroc-ice-dev \
zsync \
appstream \
libpoco-dev
4 changes: 2 additions & 2 deletions .ci/azure-pipelines/main-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-22.04'
steps:
- template: steps_linux.yml

- job: macOS
workspace:
clean: all
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
variables:
MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx-release.2023-12-31.6a3ce9c65'
MUMBLE_ENVIRONMENT_TRIPLET: 'x64-osx-release'
Expand Down
2 changes: 1 addition & 1 deletion .ci/azure-pipelines/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-22.04'
steps:
- template: steps_linux.yml

Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,9 @@ jobs:
backport:
name: Backport PR
runs-on: ubuntu-latest
if: |
github.event.pull_request.merged == true
&& contains(github.event.pull_request.labels.*.name, 'backport-needed')
&& (
(github.event.action == 'labeled' && github.event.label.name == 'backport-needed')
|| (github.event.action == 'closed')
)
steps:
- name: Backport Action
uses: sqren/backport-github-action@v8.9.3
uses: sorenlouv/backport-github-action@v9.5.1
with:
github_token: ${{ secrets.BACKPORT_TOKEN }}
auto_backport_label_prefix: auto-backport-to-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, ubuntu-22.04]
os: [ubuntu-22.04, ubuntu-24.04]
type: [shared] # Currently the "static" build doesn't work for Linux systems
arch: [64bit]

Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/code-ql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,32 @@ jobs:
needs: pre_run
if: needs.pre_run.outputs.should_skip != 'true'

runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest]

runs-on: ${{ matrix.os }}

permissions:
security-events: write
actions: read
contents: read

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: 'recursive'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: python, cpp

- uses: ./.github/actions/install-dependencies
with:
type: shared
os: ubuntu-20.04
os: ${{ matrix.os }}
arch: 64bit

- name: Create build dir
Expand All @@ -62,4 +66,4 @@ jobs:
shell: bash

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
14 changes: 9 additions & 5 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@ on: [pull_request]

jobs:
pr-checks:
runs-on: ubuntu-20.04
strategy:
matrix:
os: [ubuntu-latest]

runs-on: ${{ matrix.os }}

steps:

- name: Install Python
run: sudo apt install python3
shell: bash

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Assume that there are not >200 new commits that need checking
fetch-depth: 200
Expand All @@ -32,16 +36,16 @@ jobs:
- uses: ./.github/actions/install-dependencies
with:
type: shared
os: ubuntu-20.04
os: ${{ matrix.os }}
arch: 64bit

- name: Generate compile-command DB
run: mkdir build; cd build; cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..; cd ..; ln -s build/compile_commands.json .
shell: bash

- name: Check code formatting
uses: jidicula/clang-format-action@v3.5.2
uses: jidicula/clang-format-action@v4.13.0
with:
clang-format-version: '10'
check-path: '.'
exclude-regex: '(3rdparty/*|build/*)'
exclude-regex: '(\\.git/.*|3rdparty/.*|build/.*|.*proto$)'
2 changes: 1 addition & 1 deletion .github/workflows/release_dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Dispatch release to mumble-docker repo"
uses: peter-evans/repository-dispatch@v2
uses: peter-evans/repository-dispatch@v3
with:
token: ${{ secrets.DOCKER_REPO_ACCCESS_TOKEN }}
event-type: new_release
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale_issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
permissions:
issues: write
steps:
- uses: actions/stale@v5
- uses: actions/stale@v9
with:
days-before-issue-stale: 14
days-before-issue-close: 7
Expand All @@ -31,7 +31,7 @@ jobs:
permissions:
issues: write
steps:
- uses: actions/stale@v5
- uses: actions/stale@v9
with:
days-before-issue-stale: 4
days-before-issue-close: 3
Expand Down

0 comments on commit 325e70e

Please sign in to comment.