Skip to content

Commit f4ece2f

Browse files
AnthonyFullerAnthonyFuller
authored
Merge branch 'master' into grape/oauth410
2 parents e52f3fd + 8fe8020 commit f4ece2f

62 files changed

Lines changed: 2858 additions & 1101 deletions

Some content is hidden

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

‎.cirrus.yml‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎.github/workflows/build.yml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Build
2+
3+
on:
4+
push:
5+
branches: [ "v*", "master" ]
6+
tags: [ "v*" ]
7+
pull_request:
8+
branches: [ "v*", "master" ]
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
build:
15+
name: Build Peacock
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Harden the runner (Audit all outbound calls)
20+
uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
21+
with:
22+
egress-policy: audit
23+
24+
- name: Checkout repository
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
26+
with:
27+
persist-credentials: false
28+
29+
- name: Setup Node
30+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.0.0
31+
with:
32+
node-version-file: .nvmrc
33+
cache: yarn
34+
35+
- name: Enable Corepack
36+
run: corepack enable
37+
38+
- name: Install dependencies
39+
run: yarn install --immutable
40+
41+
- name: Build Modules
42+
run: yarn build
43+
44+
- name: Optimize
45+
run: yarn optimize
46+
47+
- name: Download Node.js (Windows)
48+
run: |
49+
curl https://nodejs.org/dist/$(cat .nvmrc)/node-$(cat .nvmrc)-win-x64.zip -o node.zip
50+
unzip node.zip
51+
mkdir nodedist
52+
cp node-$(cat .nvmrc)-win-x64/node.exe nodedist/node.exe
53+
cp node-$(cat .nvmrc)-win-x64/LICENSE nodedist/LICENSE
54+
55+
- name: Assemble Full (Windows)
56+
run: ./packaging/ciAssemble.sh
57+
58+
- name: Assemble Linux
59+
run: ./packaging/ciAssemble.sh linux
60+
61+
- name: Upload Peacock Release
62+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.0
63+
with:
64+
name: Peacock-Release
65+
path: Peacock-v*.zip
66+
67+
- name: Upload SourceMap
68+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.0
69+
with:
70+
name: SourceMap
71+
path: chunk0.js.map

‎.github/workflows/codeql.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
pull_request:
77
branches: [ "v6", v*, "master" ]
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
analyze:
1114
name: Analyze
@@ -21,20 +24,25 @@ jobs:
2124
language: [ "javascript" ]
2225

2326
steps:
27+
- name: Harden the runner (Audit all outbound calls)
28+
uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
29+
with:
30+
egress-policy: audit
31+
2432
- name: Checkout repository
25-
uses: actions/checkout@v6.0.2
33+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2634
with:
2735
persist-credentials: false
2836

2937
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@v4
38+
uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4
3139
with:
3240
languages: ${{ matrix.language }}
3341

3442
- name: Autobuild
35-
uses: github/codeql-action/autobuild@v4
43+
uses: github/codeql-action/autobuild@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4
3644

3745
- name: Perform CodeQL Analysis
38-
uses: github/codeql-action/analyze@v4
46+
uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4
3947
with:
4048
category: "/language:${{matrix.language}}"

‎.github/workflows/locale-mod.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,27 @@ jobs:
1111
runs-on: windows-latest
1212

1313
steps:
14+
- name: Harden the runner (Audit all outbound calls)
15+
uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
16+
with:
17+
egress-policy: audit
18+
1419
- name: Checkout Peacock
15-
uses: actions/checkout@v6.0.2
20+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1621
with:
1722
persist-credentials: false
1823
token: ${{ secrets.PEACOCKBOT_TOKEN }}
1924
path: "./Peacock"
2025

2126
- name: Checkout Peacock Strings
22-
uses: actions/checkout@v6.0.2
27+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2328
with:
2429
token: ${{ secrets.PEACOCKBOT_TOKEN }}
2530
repository: thepeacockproject/peacock-strings
2631
path: "./PeacockStrings"
2732

2833
- name: Setup Node
29-
uses: actions/setup-node@v6
34+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.0.0
3035
with:
3136
node-version-file: "./Peacock/.nvmrc"
3237
cache: "yarn"
@@ -39,7 +44,7 @@ jobs:
3944
4045
- name: Download RPKG-CLI
4146
id: rpkgcli
42-
uses: robinraju/release-downloader@v1.12
47+
uses: step-security/release-downloader@97a991ef6b59ac73abb83e8e4b70a73118d27d44 # v1.12.0
4348
with:
4449
repository: "glacier-modding/RPKG-Tool"
4550
latest: true
@@ -48,7 +53,7 @@ jobs:
4853

4954
- name: Download HMLanguageTools
5055
id: hmlt
51-
uses: robinraju/release-downloader@v1.12
56+
uses: step-security/release-downloader@97a991ef6b59ac73abb83e8e4b70a73118d27d44 # v1.12.0
5257
with:
5358
repository: "AnthonyFuller/TonyTools"
5459
latest: true
@@ -71,7 +76,7 @@ jobs:
7176
copy ./Peacock/resources/peacockstrings.locr.json ./PeacockStrings/content/chunk0/peacockstrings.locr.json
7277
7378
- name: Push updated Peacock LOCR
74-
uses: EndBug/add-and-commit@v10
79+
uses: step-security/add-and-commit@6b975a6ae39f11794750730d8846a1d2e84699ba # v10.0.0
7580
with:
7681
cwd: "./PeacockStrings"
7782
add: content/chunk0/peacockstrings.locr.json

‎.github/workflows/locale.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,19 @@ jobs:
1212
runs-on: windows-latest
1313

1414
steps:
15+
- name: Harden the runner (Audit all outbound calls)
16+
uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
17+
with:
18+
egress-policy: audit
19+
1520
- name: Checkout Peacock
16-
uses: actions/checkout@v6.0.2
21+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1722
with:
1823
token: ${{ secrets.PEACOCKBOT_TOKEN }}
1924
path: "./Peacock"
2025

2126
- name: Setup Node
22-
uses: actions/setup-node@v6
27+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.0.0
2328
with:
2429
node-version-file: "./Peacock/.nvmrc"
2530
cache: "yarn"
@@ -32,7 +37,7 @@ jobs:
3237
3338
- name: Download RPKG-CLI
3439
id: rpkgcli
35-
uses: robinraju/release-downloader@v1.12
40+
uses: step-security/release-downloader@97a991ef6b59ac73abb83e8e4b70a73118d27d44 # v1.12.0
3641
with:
3742
repository: "glacier-modding/RPKG-Tool"
3843
latest: true
@@ -41,7 +46,7 @@ jobs:
4146

4247
- name: Download HMLanguageTools
4348
id: hmlt
44-
uses: robinraju/release-downloader@v1.12
49+
uses: step-security/release-downloader@97a991ef6b59ac73abb83e8e4b70a73118d27d44 # v1.12.0
4550
with:
4651
repository: "AnthonyFuller/TonyTools"
4752
latest: true
@@ -60,7 +65,7 @@ jobs:
6065
yarn rebuild-locale
6166
6267
- name: Push updated RPKG files
63-
uses: EndBug/add-and-commit@v10
68+
uses: step-security/add-and-commit@6b975a6ae39f11794750730d8846a1d2e84699ba # v10.0.0
6469
with:
6570
cwd: "./Peacock"
6671
add: |

‎.github/workflows/patcher-darwin.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@ on:
88
branches: [ "v*", "master" ]
99
paths: [ "patcher-darwin/**/*" ]
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
build:
1316
name: Build macOS Patcher
1417
runs-on: macos-latest
1518

1619
steps:
20+
- name: Harden the runner (Audit all outbound calls)
21+
uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
22+
with:
23+
egress-policy: audit
24+
1725
- name: Checkout repository
18-
uses: actions/checkout@v6.0.2
26+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1927

2028
- name: Configure CMake
2129
run: cmake -S patcher-darwin -B patcher-darwin/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
@@ -24,7 +32,7 @@ jobs:
2432
run: cmake --build patcher-darwin/build --config Release
2533

2634
- name: Upload patcher-darwin
27-
uses: actions/upload-artifact@v7
35+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.0
2836
with:
2937
name: patcher-darwin
3038
path: patcher-darwin/build/PeacockPatcher

‎.github/workflows/patcher-publish.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,24 @@ on:
66
env:
77
GH_TOKEN: ${{ github.token }}
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
publish:
14+
permissions:
15+
contents: write # for Git to git push
1116
name: Publish Patcher
1217
runs-on: ubuntu-latest
1318

1419
steps:
20+
- name: Harden the runner (Audit all outbound calls)
21+
uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
22+
with:
23+
egress-policy: audit
24+
1525
- name: Checkout repository
16-
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
26+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1727
with:
1828
ref: ${{ github.ref_name }}
1929
path: repository

‎.github/workflows/patcher.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,25 @@ on:
1111
env:
1212
DOTNET_VERSION: 8.x
1313

14+
permissions:
15+
contents: read
16+
1417
jobs:
1518
build:
1619
name: Build Patcher
1720
runs-on: ubuntu-latest
1821

1922
steps:
23+
- name: Harden the runner (Audit all outbound calls)
24+
uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
25+
with:
26+
egress-policy: audit
27+
2028
- name: Checkout repository
21-
uses: actions/checkout@v6.0.2
29+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2230

2331
- name: Setup .NET Core
24-
uses: actions/setup-dotnet@v5
32+
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
2533
with:
2634
dotnet-version: ${{ env.DOTNET_VERSION }}
2735

@@ -33,7 +41,7 @@ jobs:
3341
dotnet publish HitmanPatcher/HitmanPatcher.csproj -c Release -p DebugType=none -o Publish/Windows
3442
3543
- name: Upload patcher-windows
36-
uses: actions/upload-artifact@v7
44+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.0
3745
with:
3846
name: patcher-windows
3947
path: patcher/Publish/Windows/ILRepack

0 commit comments

Comments
 (0)