Skip to content

Commit a80be23

Browse files
EastArcticaEastArctica
committed
Merge branch 'stonecutter' into backports/1.21.8-vitepress
2 parents d343627 + 393f1fa commit a80be23

File tree

230 files changed

+4740
-2027
lines changed

Some content is hidden

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

230 files changed

+4740
-2027
lines changed

‎.gitattributes‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Default: text files normalized to LF in the repo
2+
* text=auto eol=lf
3+
4+
# Windows scripts should stay CRLF on checkout if you have them
5+
*.bat text eol=crlf
6+
*.cmd text eol=crlf
7+
8+
# Shell scripts should be LF
9+
*.sh text eol=lf
10+
11+
gradlew text eol=lf
12+
gradlew.bat text eol=crlf

‎.github/workflows/alpha.yml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
name: Alpha Nightly
2+
3+
on:
4+
schedule:
5+
- cron: '0 8 * * *'
6+
workflow_dispatch:
7+
8+
env:
9+
JAVA_VERSION: '21'
10+
MODRINTH_PROJECT: 2m9WfquA
11+
MOD_ID: jsmacros
12+
TZ: America/New_York
13+
14+
permissions:
15+
contents: write
16+
17+
jobs:
18+
build:
19+
runs-on: ubuntu-latest
20+
outputs:
21+
mod_version: ${{ steps.versions.outputs.mod_version }}
22+
mc_versions: ${{ steps.versions.outputs.mc_versions }}
23+
alpha_date: ${{ steps.versions.outputs.alpha_date }}
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v4
27+
28+
- name: Set up JDK
29+
uses: actions/setup-java@v4
30+
with:
31+
distribution: 'temurin'
32+
java-version: ${{ env.JAVA_VERSION }}
33+
cache: 'gradle'
34+
35+
- name: Setup Gradle
36+
uses: gradle/actions/setup-gradle@v5
37+
38+
- name: Compute versions
39+
id: versions
40+
shell: bash
41+
run: |
42+
ALPHA_DATE=$(date +%Y%m%d)
43+
MOD_VERSION=$(./gradlew -q printVersion -Pchannel=alpha -Palpha_date=${ALPHA_DATE} | tail -1 | tr -d '\n\r')
44+
MC_VERSIONS=$(./gradlew -q printMinecraftVersion -Pchannel=alpha -Palpha_date=${ALPHA_DATE} | tail -1 | tr -d '\n\r')
45+
echo "alpha_date=${ALPHA_DATE}" >> "$GITHUB_OUTPUT"
46+
echo "mod_version=${MOD_VERSION}" >> "$GITHUB_OUTPUT"
47+
echo "mc_versions=${MC_VERSIONS}" >> "$GITHUB_OUTPUT"
48+
49+
- name: Build distribution
50+
run: ./gradlew createDist -Pchannel=alpha -Palpha_date=${{ steps.versions.outputs.alpha_date }}
51+
52+
- name: Upload dist
53+
uses: actions/upload-artifact@v4
54+
with:
55+
name: alpha-dist-${{ steps.versions.outputs.mod_version }}
56+
path: dist/**/*
57+
58+
publish:
59+
runs-on: ubuntu-latest
60+
needs: build
61+
steps:
62+
- name: Download dist
63+
uses: actions/download-artifact@v4
64+
with:
65+
name: alpha-dist-${{ needs.build.outputs.mod_version }}
66+
path: dist
67+
68+
- name: List dist contents
69+
run: ls -R dist
70+
71+
- name: Create GitHub prerelease and upload all artifacts
72+
uses: softprops/action-gh-release@v2
73+
with:
74+
tag_name: v${{ needs.build.outputs.mod_version }}-alpha-${{ needs.build.outputs.alpha_date }}
75+
name: JsMacros ${{ needs.build.outputs.mod_version }} (alpha)
76+
body: |
77+
Alpha build for JsMacros ${{ needs.build.outputs.mod_version }} (date: ${{ needs.build.outputs.alpha_date }}).
78+
Built game versions: ${{ needs.build.outputs.mc_versions }}
79+
files: |
80+
dist/**
81+
prerelease: true
82+
env:
83+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/beta.yml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: Beta Build
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
beta_number:
7+
description: 'Beta iteration number (N)'
8+
required: true
9+
mod_version:
10+
description: 'Override base MODVER (optional)'
11+
required: false
12+
13+
env:
14+
JAVA_VERSION: '21'
15+
MODRINTH_PROJECT: 2m9WfquA
16+
MOD_ID: jsmacros
17+
18+
permissions:
19+
contents: write
20+
21+
jobs:
22+
build:
23+
runs-on: ubuntu-latest
24+
outputs:
25+
mod_version: ${{ steps.versions.outputs.mod_version }}
26+
mc_versions: ${{ steps.versions.outputs.mc_versions }}
27+
gradle_args: ${{ steps.versions.outputs.gradle_args }}
28+
steps:
29+
- name: Checkout
30+
uses: actions/checkout@v4
31+
32+
- name: Set up JDK
33+
uses: actions/setup-java@v4
34+
with:
35+
distribution: 'temurin'
36+
java-version: ${{ env.JAVA_VERSION }}
37+
cache: 'gradle'
38+
39+
- name: Setup Gradle
40+
uses: gradle/actions/setup-gradle@v5
41+
42+
- name: Compute versions
43+
id: versions
44+
shell: bash
45+
run: |
46+
ARGS="-Pchannel=beta -Pbeta_number=${{ inputs.beta_number }}"
47+
if [ -n "${{ inputs.mod_version }}" ]; then
48+
ARGS="$ARGS -Pmod_version=${{ inputs.mod_version }}"
49+
fi
50+
MOD_VERSION=$(./gradlew -q printVersion $ARGS | tail -1 | tr -d '\n\r')
51+
MC_VERSIONS=$(./gradlew -q printMinecraftVersion $ARGS | tail -1 | tr -d '\n\r')
52+
echo "gradle_args=$ARGS" >> "$GITHUB_OUTPUT"
53+
echo "mod_version=${MOD_VERSION}" >> "$GITHUB_OUTPUT"
54+
echo "mc_versions=${MC_VERSIONS}" >> "$GITHUB_OUTPUT"
55+
56+
- name: Build distribution
57+
run: ./gradlew createDist ${{ steps.versions.outputs.gradle_args }}
58+
59+
- name: Upload dist
60+
uses: actions/upload-artifact@v4
61+
with:
62+
name: beta-dist-${{ steps.versions.outputs.mod_version }}
63+
path: dist/**/*
64+
65+
publish:
66+
runs-on: ubuntu-latest
67+
needs: build
68+
steps:
69+
- name: Download dist
70+
uses: actions/download-artifact@v4
71+
with:
72+
name: beta-dist-${{ needs.build.outputs.mod_version }}
73+
path: dist
74+
75+
- name: List dist contents
76+
run: ls -R dist
77+
78+
- name: Create GitHub prerelease and upload all artifacts
79+
uses: softprops/action-gh-release@v2
80+
with:
81+
tag_name: v${{ needs.build.outputs.mod_version }}-beta-${{ github.event.inputs.beta_number }}
82+
name: JsMacros ${{ needs.build.outputs.mod_version }} (beta)
83+
body: |
84+
Beta build #${{ github.event.inputs.beta_number }} for JsMacros ${{ needs.build.outputs.mod_version }}.
85+
Built game versions: ${{ needs.build.outputs.mc_versions }}
86+
files: |
87+
dist/**
88+
prerelease: true
89+
env:
90+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/betabuild.yml‎

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

‎.github/workflows/dev.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: Dev Build
2+
3+
on:
4+
push:
5+
branches: ['**']
6+
7+
permissions:
8+
contents: write
9+
10+
env:
11+
JAVA_VERSION: '21'
12+
MODRINTH_PROJECT: 2m9WfquA
13+
MOD_ID: jsmacros
14+
15+
jobs:
16+
build:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
22+
- name: Set up JDK
23+
uses: actions/setup-java@v4
24+
with:
25+
distribution: 'temurin'
26+
java-version: ${{ env.JAVA_VERSION }}
27+
cache: 'gradle'
28+
29+
- name: Setup Gradle
30+
uses: gradle/actions/setup-gradle@v5
31+
32+
- name: Compute versions
33+
id: versions
34+
shell: bash
35+
run: |
36+
SHORT_SHA=${GITHUB_SHA::7}
37+
MOD_VERSION=$(./gradlew -q printVersion -Pchannel=dev -Pbuild_sha=${SHORT_SHA} | tail -1 | tr -d '\n\r')
38+
echo "mod_version=${MOD_VERSION}" >> "$GITHUB_OUTPUT"
39+
echo "short_sha=${SHORT_SHA}" >> "$GITHUB_OUTPUT"
40+
41+
- name: Build distribution
42+
run: |
43+
SHORT_SHA=${GITHUB_SHA::7}
44+
./gradlew createDist -Pchannel=dev -Pbuild_sha=${SHORT_SHA}
45+
46+
- name: Upload dist
47+
uses: actions/upload-artifact@v4
48+
with:
49+
name: dev-dist-${{ steps.versions.outputs.mod_version }}
50+
path: dist/**/*
51+
52+
- name: Publish GitHub prerelease
53+
uses: softprops/action-gh-release@v2
54+
with:
55+
tag_name: v${{ steps.versions.outputs.mod_version }}
56+
name: Dev ${{ steps.versions.outputs.mod_version }}
57+
body: |
58+
Dev build for commit ${{ github.sha }}.
59+
60+
Alpha, beta, and release builds are available on Modrinth: https://modrinth.com/mod/easts-jsmacros/versions
61+
prerelease: true
62+
generate_release_notes: false
63+
files: |
64+
dist/jsmacros-*-fabric-${{ steps.versions.outputs.mod_version }}.jar
65+
dist/jsmacros-*-neoforge-${{ steps.versions.outputs.mod_version }}.jar
66+
dist/jsmacros-devkit-*-${{ steps.versions.outputs.mod_version }}.zip
67+
dist/jsmacros-extensions-*-${{ steps.versions.outputs.mod_version }}.zip
68+
dist/extensions/jsmacros-ext-*-${{ steps.versions.outputs.mod_version }}.jar
69+
dist/*-source.zip
70+
fail_on_unmatched_files: false
71+
token: ${{ secrets.GITHUB_TOKEN }}
72+
env:
73+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
74+
GITHUB_REF: refs/tags/v${{ steps.versions.outputs.mod_version }}

0 commit comments

Comments
 (0)