diff --git a/.github/workflows/generate-and-publish-sdk-sources.yaml b/.github/workflows/generate-and-publish-sdk-sources.yaml index c11317382..2b6907ffc 100644 --- a/.github/workflows/generate-and-publish-sdk-sources.yaml +++ b/.github/workflows/generate-and-publish-sdk-sources.yaml @@ -12,11 +12,12 @@ on: jobs: generate-and-publish-sources: - uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-full-workflow.yaml@v20241126 + uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-full-workflow.yaml@v20241217 secrets: inherit with: name: xap - version: ${{ inputs.version }} - transformations: "--headers key --operationIdsToTags" - repository: 'ExpediaGroup/xap-java-sdk' ref: ${{ github.head_ref || github.ref_name }} + repository: 'ExpediaGroup/xap-java-sdk' + sdk_repo_ref: 'v20241217' + transformations: '--headers key --operationIdsToTags' + version: ${{ inputs.version }} diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-tests.yaml similarity index 97% rename from .github/workflows/integration-test.yaml rename to .github/workflows/integration-tests.yaml index 3887c821d..f75a1cda2 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-tests.yaml @@ -55,7 +55,7 @@ jobs: mvn clean install - name: Run Integration Tests - working-directory: sdk-repo/integrations + working-directory: sdk-repo/tests/integration run: | mvn verify \ -Dcom.expediagroup.xapjavasdk.apikey="${{ secrets.API_KEY }}" \ diff --git a/.github/workflows/release-sdk.yaml b/.github/workflows/release-sdk.yaml index 052f45c20..a8312a92b 100644 --- a/.github/workflows/release-sdk.yaml +++ b/.github/workflows/release-sdk.yaml @@ -11,29 +11,19 @@ on: default: '' jobs: - run-examples: + integration-tests: strategy: matrix: jdk: [ 8, 11, 17, 21 ] - uses: ./.github/workflows/run-examples.yaml - secrets: inherit - with: - branch: ${{ inputs.branch }} - jdk: ${{ matrix.jdk }} - - integration-test: - strategy: - matrix: - jdk: [ 8, 11, 17, 21 ] - uses: ./.github/workflows/integration-test.yaml + uses: ./.github/workflows/integration-tests.yaml secrets: inherit with: branch: ${{ inputs.branch }} jdk: ${{ matrix.jdk }} release-sdk: - uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-release-sdk.yaml@v20241126 - needs: [ run-examples ] + uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-release-sdk.yaml@v20241217 + needs: [ integration-tests ] secrets: inherit with: branch: ${{ inputs.branch }}