Skip to content

Commit 93290e1

Browse files
electricbrasselectricbrass
committed
Merge branch 'protobreak' into bump-sdlmixer
2 parents 65e4242 + be4dd9e commit 93290e1

File tree

401 files changed

+37083
-25337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

401 files changed

+37083
-25337
lines changed

‎.clang-format

+3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
---
22
BasedOnStyle: Microsoft
3+
AccessModifierOffset: -4
34
AlignEscapedNewlines: Left
45
AllowShortFunctionsOnASingleLine: Inline
56
AlwaysBreakTemplateDeclarations: Yes
67
ColumnLimit: 90
78
IndentWidth: 4
9+
InsertNewlineAtEOF: true
810
PointerAlignment: Left
11+
SortIncludes: Never
912
SpaceInEmptyBlock: true
1013
UseTab: ForIndentation

‎.github/workflows/linux.yml

+26-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
should_skip: ${{ steps.check_skip.outputs.should_skip }}
1111
steps:
1212
- name: Checkout source
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414
- name: Check for build skip
1515
id: check_skip
1616
run: bash ci/check-skip.sh
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout source
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525
- name: Checkout submodules
2626
run: git submodule update --init --recursive
2727
- name: Prepare build
@@ -33,7 +33,7 @@ jobs:
3333
- name: Prepare artifact
3434
run: bash ci/ubuntu-artifact.sh
3535
- name: Upload artifact
36-
uses: actions/upload-artifact@v2
36+
uses: actions/upload-artifact@v4
3737
with:
3838
name: Odamex-Linux-x86_64
3939
path: 'build/artifact/*'
@@ -46,7 +46,7 @@ jobs:
4646
USE_SDL12: 1
4747
steps:
4848
- name: Checkout source
49-
uses: actions/checkout@v2
49+
uses: actions/checkout@v4
5050
- name: Checkout submodules
5151
run: git submodule update --init --recursive
5252
- name: Prepare build
@@ -63,34 +63,50 @@ jobs:
6363
CXX: /usr/bin/clang++
6464
steps:
6565
- name: Checkout source
66-
uses: actions/checkout@v2
66+
uses: actions/checkout@v4
6767
- name: Checkout submodules
6868
run: git submodule update --init --recursive
6969
- name: Prepare build
7070
run: bash ci/ubuntu-buildgen.sh
7171
- name: Run build
7272
run: cmake --build ./build/
73+
build-arm:
74+
name: Build (ARM64)
75+
needs: pre_job
76+
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
77+
runs-on: ubuntu-24.04-arm
78+
steps:
79+
- name: Checkout source
80+
uses: actions/checkout@v4
81+
- name: Checkout submodules
82+
run: git submodule update --init --recursive
83+
- name: Prepare build
84+
run: bash ci/ubuntu-buildgen.sh
85+
- name: Turn on problem matcher
86+
uses: ammaraskar/gcc-problem-matcher@master
87+
- name: Run build
88+
run: cmake --build ./build/
7389
build-centos:
74-
name: Build (Fedora 28)
90+
name: Build (Fedora 32)
7591
needs: pre_job
7692
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
7793
runs-on: ubuntu-latest
7894
steps:
7995
- name: Checkout source
80-
uses: actions/checkout@v2
96+
uses: actions/checkout@v4
8197
- name: Checkout submodules
8298
run: git submodule update --init --recursive
8399
- name: Run build
84100
run: bash ci/fedora-buildgen.sh
85101
build-ubuntu-bionic:
86-
name: Build (Ubuntu 18.04 LTS)
102+
name: Build (Ubuntu 20.04 LTS)
87103
needs: pre_job
88104
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
89105
runs-on: ubuntu-latest
90106
steps:
91107
- name: Checkout source
92-
uses: actions/checkout@v2
108+
uses: actions/checkout@v4
93109
- name: Checkout submodules
94110
run: git submodule update --init --recursive
95111
- name: Run build
96-
run: bash ci/ubuntu-bionic-buildgen.sh
112+
run: bash ci/ubuntu-focal-buildgen.sh

‎.github/workflows/macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
should_skip: ${{ steps.check_skip.outputs.should_skip }}
1111
steps:
1212
- name: Checkout source
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414
- name: Check for build skip
1515
id: check_skip
1616
run: bash ci/check-skip.sh
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: macos-latest
2222
steps:
2323
- name: Checkout source
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525
- name: Checkout submodules
2626
run: git submodule update --init --recursive
2727
- name: Prepare build

‎.github/workflows/release-upversion.yml

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
# Release Upversion
2+
# Runs on release branch push (create method doesn't support ignoring tags yet)
3+
# Designed to run upversion and create a PR with the changes
4+
#
5+
# When the release is tagged and published, merge to stable
6+
# before deleting
7+
name: Release-Upversion-PR
8+
9+
on:
10+
push:
11+
branches:
12+
- 'release/[0-9]+.[0-9]+.[0-9]+' # Only run on major.minor.patch releases
13+
14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
18+
jobs:
19+
pre_job:
20+
name: Build Preparation
21+
runs-on: ubuntu-latest
22+
outputs:
23+
build_number: ${{ steps.gitversion.outputs.buildMetaData }}
24+
new_version: ${{ steps.gitversion.outputs.majorMinorPatch }}
25+
major: ${{ steps.gitversion.outputs.major }}
26+
minor: ${{ steps.gitversion.outputs.minor }}
27+
patch: ${{ steps.gitversion.outputs.patch }}
28+
steps:
29+
- uses: actions/checkout@v4
30+
with:
31+
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
32+
fetch-depth: 0 # Required due to the way Git works, without it this action won't be able to find any or the correct tags
33+
- name: Install GitVersion
34+
uses: gittools/actions/gitversion/[email protected]
35+
with:
36+
versionSpec: '5.x'
37+
- name: Determine Version
38+
id: gitversion
39+
uses: gittools/actions/gitversion/[email protected]
40+
- name: Get branch name
41+
id: branchname
42+
uses: nelonoel/[email protected]
43+
- name: Display GitVersion outputs
44+
run: |
45+
echo "Major: ${{ steps.gitversion.outputs.major }}"
46+
echo "Minor: ${{ steps.gitversion.outputs.minor }}"
47+
echo "Patch: ${{ steps.gitversion.outputs.patch }}"
48+
echo "PreReleaseTag: ${{ steps.gitversion.outputs.preReleaseTag }}"
49+
echo "PreReleaseTagWithDash: ${{ steps.gitversion.outputs.preReleaseTagWithDash }}"
50+
echo "PreReleaseLabel: ${{ steps.gitversion.outputs.preReleaseLabel }}"
51+
echo "PreReleaseNumber: ${{ steps.gitversion.outputs.preReleaseNumber }}"
52+
echo "WeightedPreReleaseNumber: ${{ steps.gitversion.outputs.weightedPreReleaseNumber }}"
53+
echo "BuildMetaData: ${{ steps.gitversion.outputs.buildMetaData }}"
54+
echo "BuildMetaDataPadded: ${{ steps.gitversion.outputs.buildMetaDataPadded }}"
55+
echo "FullBuildMetaData: ${{ steps.gitversion.outputs.fullBuildMetaData }}"
56+
echo "MajorMinorPatch: ${{ steps.gitversion.outputs.majorMinorPatch }}"
57+
echo "SemVer: ${{ steps.gitversion.outputs.semVer }}"
58+
echo "LegacySemVer: ${{ steps.gitversion.outputs.legacySemVer }}"
59+
echo "LegacySemVerPadded: ${{ steps.gitversion.outputs.legacySemVerPadded }}"
60+
echo "AssemblySemVer: ${{ steps.gitversion.outputs.assemblySemVer }}"
61+
echo "AssemblySemFileVer: ${{ steps.gitversion.outputs.assemblySemFileVer }}"
62+
echo "FullSemVer: ${{ steps.gitversion.outputs.fullSemVer }}"
63+
echo "InformationalVersion: ${{ steps.gitversion.outputs.informationalVersion }}"
64+
echo "BranchName: ${{ steps.gitversion.outputs.branchName }}"
65+
echo "EscapedBranchName: ${{ steps.gitversion.outputs.escapedBranchName }}"
66+
echo "Sha: ${{ steps.gitversion.outputs.sha }}"
67+
echo "ShortSha: ${{ steps.gitversion.outputs.shortSha }}"
68+
echo "NuGetVersionV2: ${{ steps.gitversion.outputs.nuGetVersionV2 }}"
69+
echo "NuGetVersion: ${{ steps.gitversion.outputs.nuGetVersion }}"
70+
echo "NuGetPreReleaseTagV2: ${{ steps.gitversion.outputs.nuGetPreReleaseTagV2 }}"
71+
echo "NuGetPreReleaseTag: ${{ steps.gitversion.outputs.nuGetPreReleaseTag }}"
72+
echo "VersionSourceSha: ${{ steps.gitversion.outputs.versionSourceSha }}"
73+
echo "CommitsSinceVersionSource: ${{ steps.gitversion.outputs.commitsSinceVersionSource }}"
74+
echo "CommitsSinceVersionSourcePadded: ${{ steps.gitversion.outputs.commitsSinceVersionSourcePadded }}"
75+
echo "UncommittedChanges: ${{ steps.gitversion.outputs.uncommittedChanges }}"
76+
echo "CommitDate: ${{ steps.gitversion.outputs.commitDate }}"
77+
upversion-and-pr:
78+
name: Upversion and PR
79+
needs: pre_job
80+
runs-on: windows-latest
81+
env:
82+
build_number: ${{ needs.pre_job.outputs.build_number }}
83+
new_version: ${{ needs.pre_job.outputs.new_version }}
84+
steps:
85+
- uses: actions/checkout@v4
86+
- name: Run Upversion
87+
id: upversion
88+
shell: pwsh
89+
run: |
90+
.\tools\upversion\upversion.ps1
91+
env:
92+
MAJORVERSION: ${{ needs.pre_job.outputs.major }}
93+
MINORVERSION: ${{ needs.pre_job.outputs.minor }}
94+
PATCHVERSION: ${{ needs.pre_job.outputs.patch }}
95+
- name: Create Pull Request
96+
uses: peter-evans/create-pull-request@v7
97+
with:
98+
commit-message: upversion to version ${{env.new_version}}
99+
title: Upversion release branch to ${{env.new_version}}
100+
body: |
101+
This PR covers the task of upversioning the release branch to its intended version.
102+
After accepting this PR, you may publish the release after verifying the artifacts.

0 commit comments

Comments
 (0)