Skip to content

Commit

Permalink
chore: Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
StarWishsama committed Oct 20, 2023
2 parents 3141a30 + 5c074e9 commit 7affe4c
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 77 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
architecture: x64
cache: maven
- name: Codestyle Check
run: mvn -B spotless:check -s $GITHUB_WORKSPACE/settings.xml --file pom.xml --errors
run: mvn -B spotless:check --errors
- name: Build Slimefun
run: mvn -B package -s $GITHUB_WORKSPACE/settings.xml --file pom.xml --errors
run: mvn -B package --errors
- uses: actions/upload-artifact@v2
name: Upload Beta artifact
with:
Expand Down
15 changes: 3 additions & 12 deletions .github/workflows/dev-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ on:
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
Expand All @@ -28,23 +25,17 @@ jobs:
architecture: x64
cache: maven
- name: Codestyle check
run: mvn -B spotless:check --file pom.xml --errors
run: mvn -B spotless:check --errors
- name: Build Slimefun
run: mvn -B package -s $GITHUB_WORKSPACE/settings.xml --file pom.xml --errors
env:
GITHUB_TOKEN: ${{ github.token }}
- name: Publish Slimefun
run: mvn -B deploy --file pom.xml --errors
env:
GITHUB_TOKEN: ${{ github.token }}
run: mvn -B package --errors
- name: Mask Output
run: |
echo "::add-mask::$CF_API_TOKEN"
env:
CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
- name: Get build artifact filename
run: |
cd target && FILENAME=$(find . -maxdepth 1 -mindepth 1 -name "slimefun-*" | cut -d'/' -f 2)
cd target && FILENAME=$(find . -maxdepth 1 -mindepth 1 -name "Slimefun-*" | cut -d'/' -f 2)
echo "slimefun-artifact-name=$FILENAME" >> "$GITHUB_ENV"
cd ..
- name: Upload Build to R2
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/package-maintainer.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/pr-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
java-package: jdk
architecture: x64
- name: Codestyle Check
run: mvn -B spotless:check compile -s $GITHUB_WORKSPACE/settings.xml --file pom.xml --errors
run: mvn -B spotless:check compile --errors
10 changes: 1 addition & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<modelVersion>4.0.0</modelVersion>
<groupId>com.github.slimefun</groupId>
<artifactId>slimefun</artifactId>
<artifactId>Slimefun</artifactId>

<!-- Our default version will be UNOFFICIAL, this will prevent auto updates -->
<!-- from overriding our local test file -->
Expand Down Expand Up @@ -36,14 +36,6 @@
<url>https://github.com/Slimefun/Slimefun4/issues</url>
</issueManagement>

<distributionManagement>
<repository>
<id>github</id>
<name>GitHub StarWishsama Apache Maven Packages</name>
<url>https://maven.pkg.github.com/StarWishsama/Slimefun-Secret</url>
</repository>
</distributionManagement>

<licenses>
<license>
<!-- License -->
Expand Down
36 changes: 0 additions & 36 deletions settings.xml

This file was deleted.

0 comments on commit 7affe4c

Please sign in to comment.