Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c105846646 | ||
|
|
fb117e0cac | ||
|
|
63e8b5f94a | ||
|
|
559061bf5a | ||
|
|
b0f567e18b | ||
|
|
875f7ec25f |
No files matched your search
@@ -0,0 +1,37 @@
|
||||
name: Backport
|
||||
on:
|
||||
pull_request_target:
|
||||
types: [closed, labeled]
|
||||
permissions:
|
||||
contents: read
|
||||
jobs:
|
||||
backport:
|
||||
name: Backport Pull Request
|
||||
permissions:
|
||||
# for korthout/backport-action
|
||||
contents: write
|
||||
pull-requests: write
|
||||
if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
|
||||
runs-on: ubuntu-24.04-arm
|
||||
steps:
|
||||
- name: Generate GitHub App token
|
||||
id: generate-token
|
||||
uses: actions/create-github-app-token@v1
|
||||
with:
|
||||
app-id: ${{ vars.CI_APP_ID }}
|
||||
private-key: ${{ secrets.CI_APP_PRIVATE_KEY }}
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ github.event.pull_request.head.sha }}
|
||||
# required to find all branches
|
||||
fetch-depth: 0
|
||||
- name: Create backport PRs
|
||||
uses: korthout/backport-action@d07416681cab29bf2661702f925f020aaa962997 # v3.4.1
|
||||
id: backport
|
||||
with:
|
||||
# Config README: https://github.com/korthout/backport-action#backport-action
|
||||
github_token: ${{ steps.generate-token.outputs.token }}
|
||||
github_workspace: ${{ github.workspace }}
|
||||
auto_merge_enabled: true
|
||||
pull_description: |-
|
||||
Automatic backport to `${target_branch}`, triggered by a label in #${pull_number}.
|
||||
-174
@@ -1,174 +0,0 @@
|
||||
queue_rules:
|
||||
- name: default
|
||||
# all required tests need to go here
|
||||
merge_conditions:
|
||||
- check-success=tests on macos
|
||||
- check-success=tests on ubuntu
|
||||
- check-success=installer test on macos
|
||||
- check-success=installer test on ubuntu
|
||||
- check-success=vm_tests
|
||||
batch_size: 5
|
||||
|
||||
pull_request_rules:
|
||||
- name: merge using the merge queue
|
||||
conditions:
|
||||
- base~=master|.+-maintenance
|
||||
- label~=merge-queue|dependencies
|
||||
actions:
|
||||
queue: {}
|
||||
|
||||
# The rules below will first create backport pull requests and put those in a merge queue.
|
||||
|
||||
- name: backport patches to 2.18
|
||||
conditions:
|
||||
- label=backport 2.18-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- 2.18-maintenance
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.19
|
||||
conditions:
|
||||
- label=backport 2.19-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- 2.19-maintenance
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.20
|
||||
conditions:
|
||||
- label=backport 2.20-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- 2.20-maintenance
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.21
|
||||
conditions:
|
||||
- label=backport 2.21-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- 2.21-maintenance
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.22
|
||||
conditions:
|
||||
- label=backport 2.22-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- 2.22-maintenance
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.23
|
||||
conditions:
|
||||
- label=backport 2.23-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- 2.23-maintenance
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.24
|
||||
conditions:
|
||||
- label=backport 2.24-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- "2.24-maintenance"
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.25
|
||||
conditions:
|
||||
- label=backport 2.25-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- "2.25-maintenance"
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.26
|
||||
conditions:
|
||||
- label=backport 2.26-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- "2.26-maintenance"
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.27
|
||||
conditions:
|
||||
- label=backport 2.27-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- "2.27-maintenance"
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.28
|
||||
conditions:
|
||||
- label=backport 2.28-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- "2.28-maintenance"
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.29
|
||||
conditions:
|
||||
- label=backport 2.29-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- "2.29-maintenance"
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.30
|
||||
conditions:
|
||||
- label=backport 2.30-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- "2.30-maintenance"
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
|
||||
- name: backport patches to 2.31
|
||||
conditions:
|
||||
- label=backport 2.31-maintenance
|
||||
actions:
|
||||
backport:
|
||||
branches:
|
||||
- "2.31-maintenance"
|
||||
labels:
|
||||
- automatic backport
|
||||
- merge-queue
|
||||
@@ -27,3 +27,13 @@ option(
|
||||
value : false,
|
||||
description : 'Build benchmarks (requires gbenchmark)',
|
||||
)
|
||||
|
||||
# Emulating 'auto' options, since we don't want auto_features to affect this
|
||||
# and there's no other way of conditionally defaulting the value.
|
||||
option(
|
||||
'pch',
|
||||
type : 'combo',
|
||||
choices : [ 'auto', 'enabled', 'disabled' ],
|
||||
value : 'auto',
|
||||
description : 'Use C++ Precompiled Headers to speed up compilation',
|
||||
)
|
||||
@@ -29,7 +29,11 @@ add_project_arguments(
|
||||
)
|
||||
|
||||
# GCC doesn't benefit much from precompiled headers.
|
||||
do_pch = cxx.get_id() == 'clang'
|
||||
if get_option('pch') == 'auto'
|
||||
do_pch = cxx.get_id() == 'clang'
|
||||
else
|
||||
do_pch = get_option('pch') == 'enabled'
|
||||
endif
|
||||
|
||||
# This is a clang-only option for improving build times.
|
||||
# It forces the instantiation of templates in the PCH itself and
|
||||
@@ -38,7 +42,7 @@ do_pch = cxx.get_id() == 'clang'
|
||||
# bother checking the version.
|
||||
# This feature helps in particular with the expensive nlohmann::json template
|
||||
# instantiations in libutil and libstore.
|
||||
if cxx.get_id() == 'clang'
|
||||
if cxx.get_id() == 'clang' and do_pch
|
||||
add_project_arguments('-fpch-instantiate-templates', language : 'cpp')
|
||||
endif
|
||||
|
||||
|
||||
@@ -13,3 +13,13 @@ option(
|
||||
value : 'editline',
|
||||
description : 'Which library to use for nice line editing with the Nix language REPL',
|
||||
)
|
||||
|
||||
option(
|
||||
'pch',
|
||||
type : 'combo',
|
||||
choices : [ 'auto', 'enabled', 'disabled' ],
|
||||
value : 'auto',
|
||||
description : 'Use C++ Precompiled Headers to speed up compilation',
|
||||
yield : true,
|
||||
)
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
# vim: filetype=meson
|
||||
|
||||
option(
|
||||
'pch',
|
||||
type : 'combo',
|
||||
choices : [ 'auto', 'enabled', 'disabled' ],
|
||||
value : 'auto',
|
||||
description : 'Use C++ Precompiled Headers to speed up compilation',
|
||||
yield : true,
|
||||
)
|
||||
@@ -3,3 +3,13 @@ option(
|
||||
type : 'feature',
|
||||
description : 'enable garbage collection in the Nix expression evaluator (requires Boehm GC)',
|
||||
)
|
||||
|
||||
option(
|
||||
'pch',
|
||||
type : 'combo',
|
||||
choices : [ 'auto', 'enabled', 'disabled' ],
|
||||
value : 'auto',
|
||||
description : 'Use C++ Precompiled Headers to speed up compilation',
|
||||
yield : true,
|
||||
)
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
# vim: filetype=meson
|
||||
|
||||
option(
|
||||
'pch',
|
||||
type : 'combo',
|
||||
choices : [ 'auto', 'enabled', 'disabled' ],
|
||||
value : 'auto',
|
||||
description : 'Use C++ Precompiled Headers to speed up compilation',
|
||||
yield : true,
|
||||
)
|
||||
@@ -7,3 +7,13 @@ option(
|
||||
description : 'Build benchmarks (requires gbenchmark)',
|
||||
yield : true,
|
||||
)
|
||||
|
||||
option(
|
||||
'pch',
|
||||
type : 'combo',
|
||||
choices : [ 'auto', 'enabled', 'disabled' ],
|
||||
value : 'auto',
|
||||
description : 'Use C++ Precompiled Headers to speed up compilation',
|
||||
yield : true,
|
||||
)
|
||||
|
||||
@@ -40,3 +40,13 @@ option(
|
||||
value : 'disabled',
|
||||
description : 'Enable curl-based S3 binary cache store support (requires aws-crt-cpp and curl >= 7.75.0)',
|
||||
)
|
||||
|
||||
option(
|
||||
'pch',
|
||||
type : 'combo',
|
||||
choices : [ 'auto', 'enabled', 'disabled' ],
|
||||
value : 'auto',
|
||||
description : 'Use C++ Precompiled Headers to speed up compilation',
|
||||
yield : true,
|
||||
)
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
# vim: filetype=meson
|
||||
|
||||
option(
|
||||
'pch',
|
||||
type : 'combo',
|
||||
choices : [ 'auto', 'enabled', 'disabled' ],
|
||||
value : 'auto',
|
||||
description : 'Use C++ Precompiled Headers to speed up compilation',
|
||||
yield : true,
|
||||
)
|
||||
@@ -5,3 +5,13 @@ option(
|
||||
type : 'feature',
|
||||
description : 'determine microarchitecture levels with libcpuid (only relevant on x86_64)',
|
||||
)
|
||||
|
||||
option(
|
||||
'pch',
|
||||
type : 'combo',
|
||||
choices : [ 'auto', 'enabled', 'disabled' ],
|
||||
value : 'auto',
|
||||
description : 'Use C++ Precompiled Headers to speed up compilation',
|
||||
yield : true,
|
||||
)
|
||||
|
||||
@@ -7,3 +7,13 @@ option(
|
||||
value : 'etc/profile.d',
|
||||
description : 'the path to install shell profile files',
|
||||
)
|
||||
|
||||
option(
|
||||
'pch',
|
||||
type : 'combo',
|
||||
choices : [ 'auto', 'enabled', 'disabled' ],
|
||||
value : 'auto',
|
||||
description : 'Use C++ Precompiled Headers to speed up compilation',
|
||||
yield : true,
|
||||
)
|
||||
|
||||
Reference in new issue
Block a user