mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-20 08:04:57 +01:00
Merge remote-tracking branch 'origin/master' into test/parser-utilities-ladderlogic-coverage
This commit is contained in:
16
.github/workflows/build.yml
vendored
16
.github/workflows/build.yml
vendored
@@ -14,6 +14,14 @@ on:
|
||||
|
||||
permissions: {}
|
||||
|
||||
# A newer push to a pull request makes the run for its older commit pointless, so that run is
|
||||
# cancelled (sonar.yml then marks the analysis of the older commit as skipped). A push to master
|
||||
# gets a group of its own, its commit, so the runs on master are neither cancelled nor held back
|
||||
# by one another.
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || github.sha }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: Build under Build Wrapper
|
||||
@@ -33,8 +41,16 @@ jobs:
|
||||
with:
|
||||
python-version: '3.14'
|
||||
|
||||
# A mirror that stops answering used to hold this step for over an hour.
|
||||
# Time out each download, retry it, and give up on the whole step early.
|
||||
- name: Install build dependencies
|
||||
timeout-minutes: 15
|
||||
run: |
|
||||
printf '%s\n' \
|
||||
'Acquire::Retries "3";' \
|
||||
'Acquire::http::Timeout "60";' \
|
||||
'Acquire::https::Timeout "60";' \
|
||||
| sudo tee /etc/apt/apt.conf.d/80-ci-retries > /dev/null
|
||||
sudo apt-get update -y
|
||||
sudo apt-get install -y \
|
||||
build-essential \
|
||||
|
||||
20
.github/workflows/build_bin.yml
vendored
20
.github/workflows/build_bin.yml
vendored
@@ -27,9 +27,17 @@ jobs:
|
||||
# Windows / MSVC
|
||||
# ============================================================
|
||||
|
||||
# A newer push to the same branch or pull request cancels the build of the older commit. The
|
||||
# groups are set on the build jobs rather than on the workflow, so a publish job that is already
|
||||
# running is left to finish; with a build cancelled the publish job of that run is skipped. A push
|
||||
# to master gets a group of its own, its commit, so the builds of master are never cancelled.
|
||||
|
||||
windows:
|
||||
name: Windows x64 / MSVC
|
||||
runs-on: windows-2022
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-windows-${{ github.event_name }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
@@ -183,6 +191,10 @@ jobs:
|
||||
linux:
|
||||
name: Linux x64 / GCC
|
||||
runs-on: ubuntu-24.04
|
||||
# see the note above the windows job
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-linux-${{ github.event_name }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
@@ -197,8 +209,16 @@ jobs:
|
||||
with:
|
||||
python-version: "3.14"
|
||||
|
||||
# A mirror that stops answering used to hold this step for over an hour.
|
||||
# Time out each download, retry it, and give up on the whole step early.
|
||||
- name: Install Linux dependencies
|
||||
timeout-minutes: 15
|
||||
run: |
|
||||
printf '%s\n' \
|
||||
'Acquire::Retries "3";' \
|
||||
'Acquire::http::Timeout "60";' \
|
||||
'Acquire::https::Timeout "60";' \
|
||||
| sudo tee /etc/apt/apt.conf.d/80-ci-retries > /dev/null
|
||||
sudo apt-get update
|
||||
|
||||
sudo apt-get install -y \
|
||||
|
||||
Reference in New Issue
Block a user