diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index db71cc1..7d0369b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,9 @@ name: Run tests -on: [pull_request] +on: + push: + branches: + - 'main' jobs: unit-test: @@ -17,8 +20,7 @@ jobs: run: chmod +x ./gradlew - name: Test run: ./gradlew clean allTests - - artifact: + publish: name: Publish - Nexus runs-on: ubuntu-latest needs: unit-test diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml deleted file mode 100644 index 1ea26f9..0000000 --- a/.github/workflows/master.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Merge to Main - -on: - push: - branches: - - 'main' - -jobs: - unit-test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: temurin - cache: 'gradle' - - name: Change wrapper permission - run: chmod +x ./gradlew - - name: Test - run: ./gradlew clean allTests - - artifact: - name: Publish - Nexus - runs-on: ubuntu-latest - needs: unit-test - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: temurin - cache: 'gradle' - - name: Change wrapper permission - run: chmod +x ./gradlew - - name: Release Maven package - #run: ./gradlew publishAllPublicationsToSonatypeRepository -PremoveSnapshot - run: ./gradlew assemble - env: - OSSRH_USERNAME: ${{ secrets.SONATYPE_OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.SONATYPE_OSSRH_PASSWORD }} - SIGNING_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} - SIGNING_PASSWORD: ${{ secrets.PGP_PASSPHRASE }} - - name: Release NPM package - #run: ./gradlew publishJsPackageToNpmjsRegistry -PremoveSnapshot - run: ./gradlew packJsPackage - env: - NPMJS_TOKEN: ${{ secrets.DHIS2_BOT_NPM_TOKEN }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 0000000..ea4e450 --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,19 @@ +name: Pull request + +on: [pull_request] + +jobs: + unit-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + cache: 'gradle' + - name: Change wrapper permission + run: chmod +x ./gradlew + - name: Test + run: ./gradlew clean allTests