Skip to content

Commit 17ac4e9

Browse files
opekope2opekope2
committed
Merge branch 'dev' into release/1.21
# Conflicts: # .github/workflows/build.yml # OptiGUI/build.gradle.kts # OptiGUI/src/main/kotlin/opekope2/optigui/internal/FilterLoader.kt # OptiGUI/src/main/kotlin/opekope2/optigui/internal/interaction/InteractionHandler.kt # OptiGUI/src/main/kotlin/opekope2/optigui/internal/selector/InteractionSelectors.kt # OptiGUI/src/main/kotlin/opekope2/optigui/registry/ContainerDefaultGuiTextureRegistry.kt # OptiGUI/src/main/kotlin/opekope2/optigui/resource/OptiFineFilterLoader.kt # OptiGUI/src/main/kotlin/opekope2/optigui/util/InteractionUtil.kt # OptiGUI/src/main/kotlin/opekope2/optigui/util/PathUtil.kt # OptiGUI/src/main/resources/optigui.mixins.json # gradle/libs.versions.toml # gradle/wrapper/gradle-wrapper.jar # gradle/wrapper/gradle-wrapper.properties # settings.gradle.kts
2 parents 49abb66 + d649e62 commit 17ac4e9

File tree

145 files changed

+3193
-3734
lines changed

Some content is hidden

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

145 files changed

+3193
-3734
lines changed

‎.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
schedule:
5+
interval: weekly
6+
directory: /

‎.github/workflows/build.yml

Lines changed: 16 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -3,95 +3,45 @@ name: Build project
33
on:
44
workflow_call:
55
inputs:
6-
build-project:
7-
type: boolean
86
test-project:
97
type: boolean
10-
build-docs:
11-
type: boolean
128
upload-output:
139
type: boolean
14-
fast:
15-
type: boolean
1610

1711
jobs:
18-
prepare-build-matrix:
19-
name: Prepare build matrix
20-
runs-on: ubuntu-latest
21-
steps:
22-
- name: Create build matrix
23-
id: create-build-matrix
24-
env:
25-
DEFAULT_MATRIX: '
26-
{
27-
"os": [
28-
"ubuntu-latest",
29-
"windows-latest"
30-
]
31-
}
32-
'
33-
FAST_MATRIX: '
34-
{
35-
"os": [
36-
"ubuntu-latest"
37-
]
38-
}
39-
'
40-
run: |
41-
if [ "${{ inputs.fast }}" = true ]; then
42-
echo "BUILD_MATRIX=$FAST_MATRIX" >> $GITHUB_OUTPUT
43-
else
44-
echo "BUILD_MATRIX=$DEFAULT_MATRIX" >> $GITHUB_OUTPUT
45-
fi
46-
outputs:
47-
build-matrix: ${{ steps.create-build-matrix.outputs.BUILD_MATRIX }}
48-
4912
build:
5013
name: Build project
5114
strategy:
52-
matrix: ${{ fromJson(needs.prepare-build-matrix.outputs.build-matrix) }}
15+
matrix:
16+
os:
17+
- ubuntu-latest
18+
- windows-latest
5319
runs-on: ${{ matrix.os }}
54-
needs: prepare-build-matrix
5520
steps:
5621
- name: Checkout repository
57-
uses: actions/checkout@v4.1.1
22+
uses: actions/checkout@v4.2.2
5823
- name: Validate gradle wrapper
59-
uses: gradle/[email protected]
24+
uses: gradle/actions/[email protected]
25+
- name: Load java version
26+
id: load-java-version
27+
uses: SebRollen/[email protected]
28+
with:
29+
file: gradle/libs.versions.toml
30+
field: versions.java
6031
- name: JDK setup
61-
uses: actions/setup-java@v4.2.1
32+
uses: actions/setup-java@v4.6.0
6233
with:
63-
java-version: 21
34+
java-version: ${{ steps.load-java-version.outputs.value }}
6435
distribution: temurin
6536
- name: Build project
66-
if: inputs.build-project
6737
run: ./gradlew build -x test
6838
- name: Test project
6939
if: inputs.test-project
7040
run: ./gradlew test
71-
- name: Build documentation
72-
if: inputs.build-docs
73-
run: ./gradlew :OptiGUI:dokkaHtml
74-
- name: Build documentation (Java syntax)
75-
if: inputs.build-docs
76-
run: ./gradlew :OptiGUI:dokkaHtml -PjavaSyntax
7741
- name: Upload build output
78-
if: inputs.build-project && inputs.upload-output
79-
uses: actions/upload-artifact@v4.3.1
42+
if: inputs.upload-output && matrix.os == 'ubuntu-latest'
43+
uses: actions/upload-artifact@v4.6.0
8044
with:
8145
name: jars
8246
path: OptiGUI/build/libs/*.jar
8347
if-no-files-found: error
84-
- name: Upload documentation output
85-
if: inputs.build-docs && inputs.upload-output
86-
uses: actions/[email protected]
87-
with:
88-
name: kdoc
89-
path: OptiGUI/build/dokka/kotlinHtml
90-
if-no-files-found: error
91-
- name: Upload documentation output (Java syntax)
92-
if: inputs.build-docs && inputs.upload-output
93-
uses: actions/[email protected]
94-
with:
95-
name: javadoc
96-
path: OptiGUI/build/dokka/javaHtml
97-
if-no-files-found: error

‎.github/workflows/merge-check.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ jobs:
1010
name: Check mergeability
1111
uses: ./.github/workflows/build.yml
1212
with:
13-
build-project: true
1413
test-project: true

‎.github/workflows/publish-release.yml

Lines changed: 3 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,17 @@ jobs:
1010
name: Build OptiGUI
1111
uses: ./.github/workflows/build.yml
1212
with:
13-
build-project: true
14-
build-docs: true
1513
upload-output: true
16-
fast: true
1714

1815
publish:
1916
name: Publish OptiGUI
2017
runs-on: ubuntu-latest
2118
needs: build
2219
steps:
2320
- name: Checkout repository
24-
uses: actions/checkout@v4.1.1
21+
uses: actions/checkout@v4.2.2
2522
- name: Download build output
26-
uses: actions/[email protected].4
23+
uses: actions/[email protected].8
2724
with:
2825
name: jars
2926
path: dist
@@ -68,83 +65,8 @@ jobs:
6865
game-version-filter: releases
6966
java: ${{ steps.load-java-version.outputs.value }}
7067
- name: Delete build output
71-
uses: geekyeggo/delete-artifact@v5.0.0
68+
uses: geekyeggo/delete-artifact@v5.1.0
7269
with:
7370
name: jars
7471
useGlob: false
7572
failOnError: false
76-
77-
push-docs:
78-
name: Push documentation
79-
runs-on: ubuntu-latest
80-
needs: build
81-
env:
82-
VERSION: ${{ github.ref_name }}
83-
steps:
84-
- name: Checkout repository
85-
uses: actions/[email protected]
86-
with:
87-
fetch-depth: 0
88-
ref: docs
89-
- name: Configure git
90-
run: |
91-
git config user.email "[email protected]"
92-
git config user.name "github-actions[bot]"
93-
- name: Download Kotlin documentation
94-
uses: actions/[email protected]
95-
with:
96-
name: kdoc
97-
path: docs/kdoc/${{ github.ref_name }}
98-
- name: Download Java documentation
99-
uses: actions/[email protected]
100-
with:
101-
name: javadoc
102-
path: docs/javadoc/${{ github.ref_name }}
103-
- name: Update latest documentation folder (Kotlin)
104-
run: |
105-
cd docs/kdoc
106-
unlink latest
107-
ln -s $VERSION latest
108-
- name: Update latest documentation folder (Java)
109-
run: |
110-
cd docs/javadoc
111-
unlink latest
112-
ln -s $VERSION latest
113-
- name: Update links
114-
run: |
115-
sed -i "s|#CI_KDOC_PLACEHOLDER|#CI_KDOC_PLACEHOLDER\n - $VERSION: kdoc/$VERSION|g" mkdocs.yml
116-
sed -i "s|#CI_JAVADOC_PLACEHOLDER|#CI_JAVADOC_PLACEHOLDER\n - $VERSION: javadoc/$VERSION|g" mkdocs.yml
117-
- name: Commit documentation
118-
run: |
119-
git add docs
120-
git commit -a -m "Add documentation for $VERSION"
121-
- name: Push documentation
122-
uses: ad-m/[email protected]
123-
with:
124-
branch: docs
125-
- name: Delete documentation artifacts
126-
uses: geekyeggo/[email protected]
127-
with:
128-
name: |
129-
kdoc
130-
javadoc
131-
useGlob: false
132-
failOnError: false
133-
134-
publish-docs:
135-
name: Publish documentation
136-
runs-on: ubuntu-latest
137-
needs: push-docs
138-
steps:
139-
- name: Checkout repository
140-
uses: actions/[email protected]
141-
with:
142-
ref: docs
143-
- name: Configure git
144-
run: |
145-
git config user.email "[email protected]"
146-
git config user.name "github-actions[bot]"
147-
- name: Publish documentation
148-
uses: mhausenblas/[email protected]
149-
env:
150-
GITHUB_TOKEN: ${{ github.token }}

0 commit comments

Comments
 (0)