Skip to content

Commit 207fa53

Browse files
author
passplease
committed
Support EnderStorage;
Build docker image for this project
1 parent c74c140 commit 207fa53

File tree

4 files changed

+11
-46
lines changed

4 files changed

+11
-46
lines changed

.github/workflows/publish.yml

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build
1+
name: Build Image and Mod
22

33
on:
44
workflow_dispatch:
@@ -12,6 +12,7 @@ on:
1212
- build.gradle
1313
- gradle.properties
1414
- settings.gradle
15+
- Dockerfile
1516

1617
jobs:
1718
build-docker-image:
@@ -41,47 +42,21 @@ jobs:
4142
with:
4243
gradle-version: '8.11.1'
4344

44-
# - name: Extract metadata for Docker
45-
# id: meta
46-
# uses: docker/metadata-action@v5
47-
# with:
48-
# images: ghcr.io/${{ github.repository }}
49-
5045
- name: Build and push Docker image
5146
run: gradle pushDockerImage
5247
env:
5348
PROJECT_NAME: ${{ github.repository }}
54-
55-
# - name: Build and push Docker image
56-
# id: docker_build
57-
# uses: docker/build-push-action@v5
58-
# with:
59-
# context: .
60-
# file: ./Dockerfile
61-
# push: true # 关键:设置为 true 来推送镜像
62-
# tags: 1.20.1-forge
63-
# labels: ${{ steps.meta.outputs.labels }}
49+
TAG: 1.20.1-6.0.0-forge
6450

6551
build:
6652
permissions:
6753
contents: write
68-
runs-on: ubuntu-latest
54+
runs-on: ghcr.io/passplease/scs-test:1.20.1-6.0.0-forge
6955
needs: build-docker-image
7056
steps:
7157
- name: Checkout repository
7258
uses: actions/checkout@v4
7359

74-
# - name: Setup JDK 21
75-
# uses: actions/setup-java@v4
76-
# with:
77-
# java-version: '21'
78-
# distribution: 'temurin'
79-
#
80-
# - name: Setup Gradle
81-
# uses: gradle/actions/setup-gradle@v4
82-
# with:
83-
# gradle-version: '8.11.1'
84-
8560
- name: Build with Gradle
8661
run: gradle build
8762

@@ -111,22 +86,11 @@ jobs:
11186
permissions:
11287
contents: write
11388
needs: build-docker-image
114-
runs-on: ubuntu-latest
89+
runs-on: ghcr.io/passplease/scs-test:1.20.1-6.0.0-forge
11590
steps:
11691
- name: Checkout repository
11792
uses: actions/checkout@v4
11893

119-
# - name: Setup JDK 21
120-
# uses: actions/setup-java@v4
121-
# with:
122-
# java-version: '21'
123-
# distribution: 'temurin'
124-
#
125-
# - name: Setup Gradle
126-
# uses: gradle/actions/setup-gradle@v4
127-
# with:
128-
# gradle-version: '8.11.1'
129-
13094
- name: Test Server with ${{ matrix.GameTestConfig }}
13195
run: gradle runGameTestServer -PGameTestConfig=${{ matrix.GameTestConfig }}
13296
continue-on-error: true

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
GameTestConfig: [ default, testAE ]
1010
permissions:
1111
contents: write
12-
runs-on: ubuntu-latest
12+
runs-on: ghcr.io/passplease/scs-test:1.20.1-6.0.0-forge
1313
steps:
1414
- name: Checkout repository
1515
uses: actions/checkout@v4

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
FROM gradle:8.11.1-jdk21-focal
1+
FROM gradle:8.14.3-jdk21
22

33
WORKDIR /temp
44

55
COPY . .
66

7-
RUN gradle runGameTestServer && rm -rm -f ./temp
7+
RUN gradle runGameTestServer || true;\
8+
rm -rf ./temp

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ tasks.withType(JavaCompile).configureEach {
207207
import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
208208
import com.bmuschko.gradle.docker.tasks.image.DockerPushImage
209209

210-
def imageName = "ghcr.io/${System.getenv("PROJECT_NAME")}:${mod_version}"
211-
imageName.replaceAll('-','_')
210+
def imageName = "ghcr.io/${System.getenv("PROJECT_NAME")}:${mod_version}".toLowerCase()
211+
def tag = "ghcr.io/${System.getenv("PROJECT_NAME")}:${System.getenv("TAG")}"
212212

213213
tasks.register('buildDockerImage', DockerBuildImage) {
214214
inputDir = project.projectDir

0 commit comments

Comments
 (0)