From 4408ed89d5ed2d7e3c519dd2033b40c0372414c1 Mon Sep 17 00:00:00 2001
From: bombcar <github@bombcar.com>
Date: Wed, 2 Mar 2022 16:58:05 -0600
Subject: build to maven

---
 .github/workflows/build-and-test.yml | 14 +++++++-------
 .github/workflows/release-tags.yml   | 16 +++-------------
 2 files changed, 10 insertions(+), 20 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 08df9fe89f..56a1ad52cc 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -14,16 +14,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-      with: 
+      with:
         fetch-depth: 0
-    
+
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
         java-version: '8'
         distribution: 'adopt'
         cache: gradle
-        
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
@@ -36,10 +36,10 @@ jobs:
     - name: Run server for 1.5 minutes
       run: |
         mkdir run
-        echo "eula=true" > run/eula.txt  
-        timeout 90 ./gradlew runServer | tee --append server.log || true
+        echo "eula=true" > run/eula.txt
+        timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true
 
     - name: Test no errors reported during server run
       run: |
-        chmod +x .github/scripts/test-no-error-reports.sh
-        .github/scripts/test-no-error-reports.sh
+        chmod +x .github/scripts/test_no_error_reports
+        .github/scripts/test_no_error_reports
diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml
index 96d37f7d9a..c86d8889b7 100644
--- a/.github/workflows/release-tags.yml
+++ b/.github/workflows/release-tags.yml
@@ -44,18 +44,8 @@ jobs:
           title: "${{ env.RELEASE_VERSION }}"
           files: build/libs/*.jar
 
-      - name: Set repository owner and name
-        run: |
-          echo "REPOSITORY_OWNER=${GITHUB_REPOSITORY%/*}" >> $GITHUB_ENV
-          echo "REPOSITORY_NAME=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
-
-      - name: Publish package
+      - name: Publish to Maven
         run: ./gradlew publish
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ARTIFACT_GROUP_ID: com.github.${{ env.REPOSITORY_OWNER }}
-          ARTIFACT_ID: "${{ env.REPOSITORY_NAME }}"
-          ARTIFACT_VERSION: "${{ env.RELEASE_VERSION }}"
-          REPOSITORY_NAME: "${{ env.REPOSITORY_NAME }}"
-          REPOSITORY_OWNER: "${{ env.REPOSITORY_OWNER }}"
-    
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-- 
cgit