Skip to content

Commit 550873e

Browse files
committed
Merge branch 'master' into feature/taskflow
2 parents 1a44be4 + f2deecb commit 550873e

File tree

3 files changed

+21
-19
lines changed

3 files changed

+21
-19
lines changed

.github/workflows/build.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,13 @@ jobs:
8181

8282
- name: Build Lambda
8383
run: ./gradlew build
84-
84+
85+
- name: Rename Files with Commit Hash
86+
run: |
87+
mv ./fabric/build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar ./fabric/build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
88+
mv ./forge/build/libs/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar ./forge/build/libs/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
89+
mv ./common/build/libs/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar ./common/build/libs/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
90+
8591
- name: Upload Lambda
8692
uses: ryand56/r2-upload-action@latest
8793
id: upload
@@ -91,33 +97,29 @@ jobs:
9197
r2-secret-access-key: ${{ secrets.R2_ACCESS_SECRET }}
9298
r2-bucket: ${{ secrets.R2_BUCKET_NAME }}
9399
source-dir: |
94-
./fabric/build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
95-
./forge/build/libs/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
96-
./common/build/libs/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
100+
./fabric/build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
101+
./forge/build/libs/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
102+
./common/build/libs/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
97103
destination-dir: ${{ env.DATE }}-${{ env.COMMIT_HASH }}
98104

99-
- name: Generate download links
105+
- name: Generate Summary
100106
if: ${{ steps.upload.outputs.result == 'success' }}
101107
run: |
102108
cat << EOF >> $GITHUB_STEP_SUMMARY
103-
Fabric https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
104-
Forge https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
105-
API (Dev only) https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
109+
### [Lambda Fabric ${{ steps.all.outputs.modVersion }} ${{ steps.all.outputs.minecraftVersion }} (${{ env.COMMIT_HASH }})](https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar)
110+
### [Lambda Forge ${{ steps.all.outputs.modVersion }} ${{ steps.all.outputs.minecraftVersion }} (${{ env.COMMIT_HASH }})](https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar)
111+
112+
#### [API (Developer Dependency)](https://r2-bucket.edouard127.christmas/${{ env.DATE }}-${{ env.COMMIT_HASH }}/lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar)
113+
114+
- **Runner:** \`${{ needs.check-runner.outputs.runner-label }}\`
106115
EOF
107116
108-
- name: Post Upload
109-
if: ${{ steps.upload.outputs.result == 'success' }}
110-
uses: actions/upload-artifact@v4
111-
with:
112-
name: download-links
113-
path: downloads.txt
114-
115117
- name: Failover Upload
116118
if: ${{ steps.upload.outputs.result == 'failure' }}
117119
uses: actions/upload-artifact@v4
118120
with:
119121
name: lambda-nightly
120122
path: |
121-
/**/build/libs/lambda-*-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar
123+
/**/build/libs/lambda-*-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }}.jar
122124
123125

common/src/main/kotlin/com/lambda/util/primitives/extension/World.kt renamed to common/src/main/kotlin/com/lambda/util/extension/World.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lambda.util.primitives.extension
1+
package com.lambda.util.extension
22

33
import com.lambda.util.world.FastVector
44
import com.lambda.util.world.x

common/src/main/kotlin/com/lambda/util/world/WorldUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.lambda.util.world
33
import com.lambda.context.SafeContext
44
import com.lambda.core.annotations.InternalApi
55
import com.lambda.util.collections.filterPointer
6-
import com.lambda.util.primitives.extension.getBlockState
7-
import com.lambda.util.primitives.extension.getFluidState
6+
import com.lambda.util.extension.getBlockState
7+
import com.lambda.util.extension.getFluidState
88
import net.minecraft.block.BlockState
99
import net.minecraft.entity.Entity
1010
import net.minecraft.fluid.Fluid

0 commit comments

Comments
 (0)