From adeb859a7974e8918fdc4793cd7bf97e9fffcdc5 Mon Sep 17 00:00:00 2001 From: JacksonAbney Date: Mon, 24 Mar 2025 15:26:12 -0800 Subject: [PATCH] Build changes --- .github/workflows/build.yml | 35 ++++------ .github/workflows/publish.yml | 121 +++++++++------------------------- 2 files changed, 41 insertions(+), 115 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f987873a..3f02fb9a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,37 +1,24 @@ name: build on: - pull_request: + workflow_dispatch: push: - branches: [ '**' ] + branches: [ '1.20.1' ] jobs: build: strategy: matrix: java: [ 17 ] - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-22.04 ] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 - with: - java-version: ${{ matrix.java }} - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: ${{ runner.os }}-gradle- - - name: Build with Gradle - run: ./gradlew build - env: - GPR_USER: ${{ secrets.GPR_USER }} - GPR_KEY: ${{ secrets.GPR_KEY }} + - name: build + run: | + git clone https://github.com/North-Western-Development/oc2r.git + cd oc2r + mkdir libs + wget https://github.com/perkinslr/oc2r/releases/latest/download/sedna.jar -O libs/sedna.jar + git checkout 1.20.1 + ./gradlew build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0de6a717..c2c79f83 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,101 +1,40 @@ name: publish on: + workflow_dispatch: release: - types: [published] + types: [created] jobs: - publish-github: - runs-on: ubuntu-latest + build: + strategy: + matrix: + java: [ 17 ] + os: [ ubuntu-22.04 ] + runs-on: ${{ matrix.os }} + steps: - - uses: actions/checkout@v2 - - - name: Extract Version from Tag - uses: rishabhgupta/split-by@v1 - id: split_tag - with: - string: ${{ github.event.release.tag_name }} - split-by: '/' - - - name: Set up JDK - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ubuntu-latest-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: ubuntu-latest-gradle- - - name: Build with Gradle - run: ./gradlew -Psemver='${{ steps.split_tag.outputs._1 }}' build - env: - GPR_USER: ${{ secrets.GPR_USER }} - GPR_KEY: ${{ secrets.GPR_KEY }} - - - name: Add Artifacts to Github Release - uses: alexellis/upload-assets@0.3.0 - env: - GITHUB_TOKEN: ${{ github.token }} - with: - asset_paths: '["./build/libs/*.jar"]' - - - name: Publish to Github Packages - run: gradle -Psemver='${{ steps.split_tag.outputs._1 }}' publish - env: - GPR_USER: ${{ secrets.GPR_USER }} - GPR_KEY: ${{ secrets.GPR_KEY }} - GITHUB_MAVEN_URL: 'https://maven.pkg.github.com/${{ github.repository }}' - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - publish-curse: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Extract Version from Tag - uses: rishabhgupta/split-by@v1 - id: split_tag - with: - string: ${{ github.event.release.tag_name }} - split-by: '/' - - - name: Set up JDK - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ubuntu-latest-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: ubuntu-latest-gradle- - - # Set Curseforge release type based on pre-release flag. - - name: Set release type to 'release' + - name: build run: | - echo "CURSEFORGE_RELEASE_TYPE=release" >> $GITHUB_ENV - if: github.event.release.prerelease == false - - name: Set release type to 'alpha' + git clone https://github.com/North-Western-Development/oc2r.git + cd oc2r + mkdir libs + wget https://github.com/perkinslr/oc2r/releases/latest/download/sedna.jar -O libs/sedna.jar + ./gradlew build + + + - name: Update Manifest run: | - echo "CURSEFORGE_RELEASE_TYPE=alpha" >> $GITHUB_ENV - if: github.event.release.prerelease == true + cat oc2r/gradle.properties | grep semver >> $GITHUB_ENV - - name: Publish to Curseforge - run: ./gradlew -Psemver='${{ steps.split_tag.outputs._1 }}' curseforge - env: - GPR_USER: ${{ secrets.GPR_USER }} - GPR_KEY: ${{ secrets.GPR_KEY }} - CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} - CURSEFORGE_RELEASE_TYPE: ${{ env.CURSEFORGE_RELEASE_TYPE }} - CHANGELOG: ${{ github.event.release.body }} + - name: Create Version Release + id: create_version_release + uses: ncipollo/release-action@v1 + with: + name: ${{ env.semver }} + allowUpdates: false + draft: false + prerelease: false + token: ${{ secrets.GITHUB_TOKEN }} + artifacts: "oc2r/build/libs/*.jar,sedna.jar" + tag: ${{ env.semver }}