-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into add-mod-settings-permissions
- Loading branch information
Showing
103 changed files
with
2,916 additions
and
1,939 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| name: mvn-dev-build-deploy | ||
|
|
||
| on: | ||
| push: | ||
| pull_request: | ||
| types: [opened, synchronize, reopened] | ||
| workflow_dispatch: | ||
|
|
||
| env: | ||
| PUBLISH_BRANCH: 'master' | ||
| OKAPI_URL: 'https://snapshot-dev-okapi.folio-dev.indexdata.com' | ||
| OKAPI_SECRET_USER: "${{ secrets.SNAPSHOT_DEV_OKAPI_USER }}" | ||
| OKAPI_SECRET_PASSWORD: "${{ secrets.SNAPSHOT_DEV_OKAPI_PASSWORD }}" | ||
| OK_SESSION: 'session1' | ||
|
|
||
| jobs: | ||
| mvn-dev-build-deploy: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis | ||
| submodules: recursive | ||
|
|
||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: 17 | ||
| distribution: 'temurin' # Alternative distribution options are available. | ||
|
|
||
| - name: Prepare okclient | ||
| run: git clone https://github.com/indexdata/okclient | ||
|
|
||
| - name: Ensure OK and FOLIO login | ||
| # So do not proceed with other workflow steps if not available. | ||
| run: | | ||
| source okclient/ok.sh | ||
| OK -S ${{ env.OK_SESSION }} \ | ||
| -h ${{ env.OKAPI_URL }} \ | ||
| -t "supertenant" \ | ||
| -u ${{ env.OKAPI_SECRET_USER }} \ | ||
| -p ${{ env.OKAPI_SECRET_PASSWORD }} | ||
| OK -S ${{ env.OK_SESSION }} -x | ||
| - name: Gather some variables | ||
| run: | | ||
| echo "MODULE_NAME=$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout)" >> $GITHUB_ENV | ||
| echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV | ||
| echo "CURRENT_BRANCH=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV | ||
| - name: Set module version | ||
| run: | | ||
| echo "MODULE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-${SHA_SHORT}" >> $GITHUB_ENV | ||
| - name: Cache SonarCloud packages | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ~/.sonar/cache | ||
| key: ${{ runner.os }}-sonar | ||
| restore-keys: ${{ runner.os }}-sonar | ||
|
|
||
| - name: Cache Maven packages | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ~/.m2 | ||
| key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} | ||
| restore-keys: ${{ runner.os }}-m2 | ||
|
|
||
| - name: Maven build | ||
| run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install org.jacoco:jacoco-maven-plugin:report | ||
|
|
||
| - name: SQ analyze | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any | ||
| SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} | ||
| run: mvn -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=indexdata -Dsonar.projectKey=indexdata_${{ github.event.repository.name }} | ||
|
|
||
| - name: Update ModuleDescriptor Id | ||
| run: | | ||
| if test -f "$MOD_DESCRIPTOR"; then | ||
| echo "Found $MOD_DESCRIPTOR" | ||
| cat <<< $(jq '.id = "${{ env.MODULE_NAME}}-${{ env.MODULE_VERSION }}"' $MOD_DESCRIPTOR) > $MOD_DESCRIPTOR | ||
| echo "MODULE_DESCRIPTOR=$MOD_DESCRIPTOR" >> $GITHUB_ENV | ||
| else | ||
| echo "Could not find $MOD_DESCRIPTOR" | ||
| exit 1 | ||
| fi | ||
| env: | ||
| MOD_DESCRIPTOR: './target/ModuleDescriptor.json' | ||
|
|
||
| - name: Read ModuleDescriptor | ||
| id: moduleDescriptor | ||
| uses: juliangruber/read-file-action@v1 | ||
| with: | ||
| path: ${{ env.MODULE_DESCRIPTOR }} | ||
|
|
||
| - name: Login to Index Data Docker Hub account | ||
| if: ${{ env.CURRENT_BRANCH == env.PUBLISH_BRANCH }} | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| username: ${{ secrets.DOCKER_USER }} | ||
| password: ${{ secrets.DOCKER_PASSWORD }} | ||
|
|
||
| - name: Build and publish Docker image | ||
| if: ${{ env.CURRENT_BRANCH == env.PUBLISH_BRANCH }} | ||
| uses: docker/build-push-action@v6 | ||
| with: | ||
| context: . | ||
| push: true | ||
| tags: indexdata/${{ env.MODULE_NAME }}:${{ env.MODULE_VERSION }},indexdata/${{ env.MODULE_NAME }}:latest | ||
|
|
||
| - name: Publish ModuleDescriptor to Okapi | ||
| if: ${{ env.CURRENT_BRANCH == env.PUBLISH_BRANCH }} | ||
| run: | | ||
| source okclient/ok.sh | ||
| echo "Do login ..." | ||
| OK -S ${{ env.OK_SESSION }} \ | ||
| -h ${{ env.OKAPI_URL }} \ | ||
| -t "supertenant" \ | ||
| -u ${{ env.OKAPI_SECRET_USER }} \ | ||
| -p ${{ env.OKAPI_SECRET_PASSWORD }} | ||
| echo "Post the MD and report the response status ..." | ||
| OK -S ${{ env.OK_SESSION }} _/proxy/modules \ | ||
| -X post -f ${{ env.MODULE_DESCRIPTOR }} | ||
| declare -n NAMEREF_STATUS=${{ env.OK_SESSION }}_HTTPStatus | ||
| echo "Response status: $NAMEREF_STATUS" | ||
| echo "Do logout ..." | ||
| OK -S ${{ env.OK_SESSION }} -x | ||
| - name: Print module version to job summary | ||
| run: | | ||
| echo "#### Module Version: ${{ env.MODULE_VERSION }}" >> $GITHUB_STEP_SUMMARY |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ env: | |
| FOLIO_MD_REGISTRY: 'https://registry.folio-dev.indexdata.com' | ||
| CONTAINER_REGISTRY: 'ghcr.io' | ||
| IMAGE_NAME: 'indexdata/mod-harvester-admin' | ||
| OK_SESSION: 'session1' | ||
|
|
||
| on: | ||
| push: | ||
|
|
@@ -19,13 +20,13 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v3 | ||
| uses: actions/checkout@v4 | ||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: '11' | ||
| java-version: '17' | ||
| distribution: 'temurin' | ||
| cache: maven | ||
| cache: 'maven' | ||
| - name: Gather some variables | ||
| run: | | ||
| echo "MODULE_NAME=$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout)" >> $GITHUB_ENV | ||
|
|
@@ -46,45 +47,34 @@ jobs: | |
| fi | ||
| env: | ||
| MOD_DESCRIPTOR: './target/ModuleDescriptor.json' | ||
| - name: Login ModuleDescriptor registry | ||
| id: login-md-registry | ||
| # uses: indiesdev/[email protected] | ||
| uses: cyberman54/[email protected] | ||
| with: | ||
| url: "${{ env.FOLIO_MD_REGISTRY }}/authn/login" | ||
| method: "POST" | ||
| accept: 201 | ||
| timeout: 5000 | ||
| retries: 3 | ||
| headers: | | ||
| { | ||
| "content-type": "application/json", | ||
| "x-okapi-tenant": "${{ secrets.FOLIO_REGISTRY_TENANT }}" | ||
| } | ||
| body: | | ||
| { | ||
| "username": "${{ secrets.FOLIO_REGISTRY_USERNAME }}", | ||
| "password": "${{ secrets.FOLIO_REGISTRY_PASSWORD }}" | ||
| } | ||
| - name: Get the MD registry login token | ||
| - name: Prepare okclient | ||
| run: git clone https://github.com/indexdata/okclient | ||
| - name: Ensure OK and FOLIO login | ||
| # So do not proceed with other workflow steps if not available. | ||
| run: | | ||
| echo "TOKEN_MD_REGISTRY=${{ fromJSON(steps.login-md-registry.outputs.response).headers['x-okapi-token'] }}" >> $GITHUB_ENV | ||
| source okclient/ok.sh | ||
| OK -S ${{ env.OK_SESSION }} \ | ||
| -h ${{ env.FOLIO_MD_REGISTRY }} \ | ||
| -t ${{ secrets.FOLIO_REGISTRY_TENANT }} \ | ||
| -u ${{ secrets.FOLIO_REGISTRY_USERNAME }} \ | ||
| -p ${{ secrets.FOLIO_REGISTRY_PASSWORD }} | ||
| OK -S ${{ env.OK_SESSION }} -x | ||
| - name: Login to GitHub Container Registry | ||
| uses: docker/login-action@v2 | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| registry: ${{ env.CONTAINER_REGISTRY }} | ||
| username: ${{ github.ACTOR }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Extract docker metadata | ||
| id: meta | ||
| uses: docker/metadata-action@v4 | ||
| uses: docker/metadata-action@v5 | ||
| with: | ||
| images: ${{ env.CONTAINER_REGISTRY }}/${{ env.IMAGE_NAME }} | ||
| labels: | | ||
| org.opencontainers.image.vendor=Index Data LLC | ||
| org.opencontainers.image.documentation=https://github.com/indexdata/localindices/tree/master/doc | ||
| - name: Build and publish Docker image | ||
| uses: docker/build-push-action@v3 | ||
| uses: docker/build-push-action@v6 | ||
| with: | ||
| context: . | ||
| push: true | ||
|
|
@@ -96,18 +86,18 @@ jobs: | |
| with: | ||
| path: ${{ env.MODULE_DESCRIPTOR }} | ||
| - name: Publish ModuleDescriptor to MD registry | ||
| id: result-md-registry | ||
| # uses: indiesdev/[email protected] | ||
| uses: cyberman54/[email protected] | ||
| with: | ||
| url: "${{ env.FOLIO_MD_REGISTRY }}/_/proxy/modules" | ||
| method: "POST" | ||
| accept: 201 | ||
| timeout: 5000 | ||
| headers: | | ||
| { | ||
| "content-type": "application/json", | ||
| "x-okapi-tenant": "${{ secrets.FOLIO_REGISTRY_TENANT }}", | ||
| "x-okapi-token": "${{ env.TOKEN_MD_REGISTRY }}" | ||
| } | ||
| body: ${{ steps.moduleDescriptor.outputs.content }} | ||
| run: | | ||
| source okclient/ok.sh | ||
| echo "Do login ..." | ||
| OK -S ${{ env.OK_SESSION }} \ | ||
| -h ${{ env.FOLIO_MD_REGISTRY }} \ | ||
| -t ${{ secrets.FOLIO_REGISTRY_TENANT }} \ | ||
| -u ${{ secrets.FOLIO_REGISTRY_USERNAME }} \ | ||
| -p ${{ secrets.FOLIO_REGISTRY_PASSWORD }} | ||
| echo "Post the MD and report the response status ..." | ||
| OK -S ${{ env.OK_SESSION }} _/proxy/modules \ | ||
| -X post -f ${{ env.MODULE_DESCRIPTOR }} | ||
| declare -n NAMEREF_STATUS=${{ env.OK_SESSION }}_HTTPStatus | ||
| echo "Response status: $NAMEREF_STATUS" | ||
| echo "Do logout ..." | ||
| OK -S ${{ env.OK_SESSION }} -x | ||
Oops, something went wrong.