diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1b9bc7b15..0d9045ab3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,58 +125,6 @@ jobs: name: built-docs path: build/html - photon-build-package: - needs: [photonclient-build, photon-build-all, photonserver-build-offline-docs] - - # The type of runner that the job will run on. - runs-on: ubuntu-latest - - steps: - # Checkout code. - - uses: actions/checkout@v1 - - # Install Java 11. - - uses: actions/setup-java@v1 - with: - java-version: 11 - - # Clear any existing web resources. - - run: | - rm -rf photon-server/src/main/resources/web/* - mkdir -p photon-server/src/main/resources/web/docs - - # Download client artifact to resources folder. - - uses: actions/download-artifact@v2 - with: - name: built-client - path: photon-server/src/main/resources/web/ - - # Download docs artifact to resources folder. - - uses: actions/download-artifact@v2 - with: - name: built-docs - path: photon-server/src/main/resources/web/docs - - # Build fat jar. - - run: | - chmod +x gradlew - ./gradlew photon-server:shadowJar - - # Upload final fat jar as artifact. - - uses: actions/upload-artifact@master - with: - name: jar - path: photon-server/build/libs - - - uses: eine/tip@master - with: - token: ${{ secrets.GITHUB_TOKEN }} - tag: 'Dev' - rm: true - files: | - photon-server/build/libs/*.jar - if: github.event_name == 'push' - photonserver-check-lint: # The type of runner that the job will run on. runs-on: ubuntu-latest @@ -299,3 +247,56 @@ jobs: wpiformat -clang 10 -f photon-lib - name: Check Output run: git --no-pager diff --exit-code HEAD + + photon-build-package: + needs: [photonclient-build, photon-build-all, photonserver-build-offline-docs, photonlib-build-host, photonlib-build-docker] + + # The type of runner that the job will run on. + runs-on: ubuntu-latest + + steps: + # Checkout code. + - uses: actions/checkout@v1 + + # Install Java 11. + - uses: actions/setup-java@v1 + with: + java-version: 11 + + # Clear any existing web resources. + - run: | + rm -rf photon-server/src/main/resources/web/* + mkdir -p photon-server/src/main/resources/web/docs + + # Download client artifact to resources folder. + - uses: actions/download-artifact@v2 + with: + name: built-client + path: photon-server/src/main/resources/web/ + + # Download docs artifact to resources folder. + - uses: actions/download-artifact@v2 + with: + name: built-docs + path: photon-server/src/main/resources/web/docs + + # Build fat jar. + - run: | + chmod +x gradlew + ./gradlew photon-server:shadowJar + + # Upload final fat jar as artifact. + - uses: actions/upload-artifact@master + with: + name: jar + path: photon-server/build/libs + + - uses: eine/tip@master + with: + token: ${{ secrets.GITHUB_TOKEN }} + tag: 'Dev' + rm: true + files: | + photon-server/build/libs/*.jar + if: github.event_name == 'push' + diff --git a/versioningHelper.gradle b/versioningHelper.gradle index f543b8a3b..cf1526ff8 100644 --- a/versioningHelper.gradle +++ b/versioningHelper.gradle @@ -8,7 +8,7 @@ gradle.allprojects { String tagIsh try { exec { - commandLine 'git', 'describe', '--tags', '--exclude="Dev"' + commandLine 'git', 'describe', '--tags', '--exclude="Dev"', '--exclude="dev"' standardOutput = stdout } tagIsh = stdout.toString().trim().toLowerCase()