diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml deleted file mode 100644 index dab69fef..00000000 --- a/.github/workflows/maven-publish.yml +++ /dev/null @@ -1,34 +0,0 @@ -# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path - -name: Maven Package - -on: - release: - types: [created] - -jobs: - build: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Build with Maven - run: mvn -B package --file pom.xml - - - name: Publish to GitHub Packages Apache Maven - run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml - env: - GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 00000000..5edf9d6b --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,48 @@ +name: Maven Build and Test + +on: + push: + branches: [ "development" ] + pull_request: + branches: [ "development" ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK and Maven + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + + - name: Build with Maven + run: mvn -B package --file pom.xml -DskipTests + + - name: Update dependency graph + if: always() # Run even if build fails + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 + + test: + needs: build + runs-on: ubuntu-latest + if: ${{ success() }} + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK and Maven + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + + - name: Test with Maven + run: mvn test + + - name: Update dependency graph + if: always() # Run even if tests fail + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 diff --git a/src/test/java/dev/gruncan/spotify/requests/urls/SpotifyAnnotationTest.java b/src/test/java/dev/gruncan/spotify/requests/urls/SpotifyAnnotationTest.java index eb7ffcad..2093cde8 100644 --- a/src/test/java/dev/gruncan/spotify/requests/urls/SpotifyAnnotationTest.java +++ b/src/test/java/dev/gruncan/spotify/requests/urls/SpotifyAnnotationTest.java @@ -21,7 +21,7 @@ public class SpotifyAnnotationTest { @Test public void spotifyRequestAnnotationTest1() { TestRequestExecutorClass1 trc = new TestRequestExecutorClass1(); - trc.setField1("value1"); + trc.setField1("value5"); assertThrows(SpotifyUrlParserException.class, () -> client.getBuiltUrlE(trc)); }