diff --git a/.github/workflows/new_issue_assign.yml b/.github/disabled-workflows/new_issue_assign.yml similarity index 100% rename from .github/workflows/new_issue_assign.yml rename to .github/disabled-workflows/new_issue_assign.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59cf1935fb64..ab8f1cc55941 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ name: Build on: push: branches: - - dtq-dev + - clarin-v7 - customer/* pull_request: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 215ead02b7e7..40bbdac273ef 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,12 +1,12 @@ # DSpace Docker image build for hub.docker.com name: Docker images -# Run this Build for all pushes to dtq-dev branch +# Run this Build for all pushes to clarin-v7 branch # Also run for PRs to ensure PR doesn't break Docker build process on: push: branches: - - dtq-dev + - clarin-v7 - customer/* pull_request: @@ -17,34 +17,34 @@ permissions: jobs: #################################################### - # Build/Push the 'dataquest/dspace-dependencies' image. + # Build/Push the 'ufal/dspace-dependencies' image. # This image is used by all other DSpace build jobs. #################################################### dspace-dependencies: - # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace' - if: github.repository == 'dataquest-dev/dspace' + # Ensure this job never runs on forked repos. It's only executed for 'ufal/dspace' + if: github.repository == 'ufal/clarin-dspace' secrets: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} uses: ./.github/workflows/reusable-docker-build.yml with: build_id: dspace-dependencies - image_name: dataquest/dspace-dependencies + image_name: ufal/dspace-dependencies dockerfile_path: ./Dockerfile.dependencies ####################################### - # Build/Push the 'dataquest/dspace' image + # Build/Push the 'ufal/dspace' image ####################################### dspace: - # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace' - if: github.repository == 'dataquest-dev/dspace' + # Ensure this job never runs on forked repos. It's only executed for 'ufal/dspace' + if: github.repository == 'ufal/clarin-dspace' # Must run after 'dspace-dependencies' job above needs: dspace-dependencies uses: ./.github/workflows/reusable-docker-build.yml with: build_id: dspace - image_name: dataquest/dspace + image_name: ufal/dspace dockerfile_path: ./Dockerfile run_python_version_script: true python_version_script_dest: dspace/config/VERSION_D.txt @@ -57,37 +57,37 @@ jobs: REDEPLOY_DEMO_URL: ${{ secrets.REDEPLOY_DEMO_URL }} ############################################################# - # Build/Push the 'dataquest/dspace' image ('-test' tag) + # Build/Push the 'ufal/dspace' image ('-test' tag) ############################################################# dspace-test: - # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace' - if: github.repository == 'dataquest-dev/dspace' + # Ensure this job never runs on forked repos. It's only executed for 'ufal/dspace' + if: github.repository == 'ufal/clarin-dspace' # Must run after 'dspace-dependencies' job above needs: dspace-dependencies uses: ./.github/workflows/reusable-docker-build.yml with: build_id: dspace-test - image_name: dataquest/dspace + image_name: ufal/dspace dockerfile_path: ./Dockerfile.test # As this is a test/development image, its tags are all suffixed with "-test". Otherwise, it uses the same - # tagging logic as the primary 'dataquest/dspace' image above. + # tagging logic as the primary 'ufal/dspace' image above. tags_flavor: suffix=-test secrets: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} ########################################### - # Build/Push the 'dataquest/dspace-cli' image + # Build/Push the 'ufal/dspace-cli' image ########################################### dspace-cli: - # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace' - if: github.repository == 'dataquest-dev/dspace' + # Ensure this job never runs on forked repos. It's only executed for 'ufal/dspace' + if: github.repository == 'ufal/clarin-dspace' # Must run after 'dspace-dependencies' job above needs: dspace-dependencies uses: ./.github/workflows/reusable-docker-build.yml with: build_id: dspace-cli - image_name: dataquest/dspace-cli + image_name: ufal/dspace-cli dockerfile_path: ./Dockerfile.cli secrets: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} @@ -95,15 +95,15 @@ jobs: ########################################### - # Build/Push the 'dataquest/dspace-solr' image + # Build/Push the 'ufal/dspace-solr' image ########################################### dspace-solr: - # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace' - if: github.repository == 'dataquest-dev/dspace' + # Ensure this job never runs on forked repos. It's only executed for 'ufal/dspace' + if: github.repository == 'ufal/clarin-dspace' uses: ./.github/workflows/reusable-docker-build.yml with: build_id: dspace-solr - image_name: dataquest/dspace-solr + image_name: ufal/dspace-solr dockerfile_path: ./dspace/src/main/docker/dspace-solr/Dockerfile # Must pass solrconfigs to the Dockerfile so that it can find the required Solr config files dockerfile_additional_contexts: 'solrconfigs=./dspace/solr/' @@ -117,15 +117,15 @@ jobs: ########################################################### - # Build/Push the 'dataquest/dspace-postgres-pgcrypto' image + # Build/Push the 'ufal/dspace-postgres-pgcrypto' image ########################################################### dspace-postgres-pgcrypto: - # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace' - if: github.repository == 'dataquest-dev/dspace' + # Ensure this job never runs on forked repos. It's only executed for 'ufal/dspace' + if: github.repository == 'ufal/clarin-dspace' uses: ./.github/workflows/reusable-docker-build.yml with: build_id: dspace-postgres-pgcrypto - image_name: dataquest/dspace-postgres-pgcrypto + image_name: ufal/dspace-postgres-pgcrypto # Must build out of subdirectory to have access to install script for pgcrypto. # NOTE: this context will build the image based on the Dockerfile in the specified directory dockerfile_context: ./dspace/src/main/docker/dspace-postgres-pgcrypto/ @@ -134,37 +134,21 @@ jobs: DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} ######################################################################## - # Build/Push the 'dataquest/dspace-postgres-pgcrypto' image (-loadsql tag) + # Build/Push the 'ufal/dspace-postgres-pgcrypto' image (-loadsql tag) ######################################################################## dspace-postgres-pgcrypto-loadsql: - # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace' - if: github.repository == 'dataquest-dev/dspace' + # Ensure this job never runs on forked repos. It's only executed for 'ufal/dspace' + if: github.repository == 'ufal/clarin-dspace' uses: ./.github/workflows/reusable-docker-build.yml with: build_id: dspace-postgres-pgcrypto-loadsql - image_name: dataquest/dspace-postgres-pgcrypto + image_name: ufal/dspace-postgres-pgcrypto # Must build out of subdirectory to have access to install script for pgcrypto. # NOTE: this context will build the image based on the Dockerfile in the specified directory dockerfile_context: ./dspace/src/main/docker/dspace-postgres-pgcrypto-curl/ # Suffix all tags with "-loadsql". Otherwise, it uses the same - # tagging logic as the primary 'dataquest/dspace-postgres-pgcrypto' image above. + # tagging logic as the primary 'ufal/dspace-postgres-pgcrypto' image above. tags_flavor: suffix=-loadsql secrets: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} - - - dspace-redeploy: - runs-on: ubuntu-latest - needs: dspace - if: false - steps: - - name: redeploy - if: '!cancelled()' - run: | - curl -H "Accept: application/vnd.github.everest-preview+json" \ - -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" \ - --request POST \ - https://api.github.com/repos/dataquest-dev/\ - dspace-angular/actions/workflows/deploy.yml/dispatches \ - --data "{\"ref\":\"refs/heads/dtq-dev\"}" diff --git a/.github/workflows/migrate-docker.yml b/.github/workflows/migrate-docker.yml deleted file mode 100644 index bbf11d1d4b97..000000000000 --- a/.github/workflows/migrate-docker.yml +++ /dev/null @@ -1,169 +0,0 @@ -# DSpace Docker image build for hub.docker.com -name: Migrate 7.5. Docker - -# Run this Build for all pushes to dtq-dev branch -# Also run for PRs to ensure PR doesn't break Docker build process -on: - push: - branches: - - migrate-to-7.5 - - dtq-dev-7.5 - pull_request: - workflow_dispatch: - -permissions: - contents: read # to fetch code (actions/checkout) - -jobs: - docker: - # Ensure this job never runs on forked repos. It's only executed for our repo - if: github.repository == 'dataquest-dev/dspace' - runs-on: ubuntu-latest - env: - # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action) - # For a new commit on default branch (main), use the literal tag 'dspace-7_x' on Docker image. - # For a new commit on other branches, use the branch name as the tag for Docker image. - # For a new tag, copy that tag name as the tag for Docker image. - IMAGE_TAGS: | - type=raw,value=migrate-to-7.5 - # Define default tag "flavor" for docker/metadata-action per - # https://github.com/docker/metadata-action#flavor-input - # We turn off 'latest' tag by default. - TAGS_FLAVOR: | - latest=false - # Architectures / Platforms for which we will build Docker images - # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work. - # If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64. NOTE: The ARM64 build takes MUCH - # longer (around 45mins or so) which is why we only run it when pushing a new Docker image. - PLATFORMS: linux/amd64${{ github.event_name != 'pull_request' && ', linux/arm64' || '' }} - - steps: - # https://github.com/actions/checkout - - name: Checkout codebase - uses: actions/checkout@v3 - - # https://github.com/docker/setup-buildx-action - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 - - # https://github.com/docker/setup-qemu-action - - name: Set up QEMU emulation to build for multiple architectures - uses: docker/setup-qemu-action@v2 - - # https://github.com/docker/login-action - - name: Login to DockerHub - # Only login if not a PR, as PRs only trigger a Docker build and not a push - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_ACCESS_TOKEN }} - - #################################################### - # Build/Push the 'dataquest/dspace-dependencies' image - #################################################### - # https://github.com/docker/metadata-action - # Get Metadata for docker_build_deps step below - - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-dependencies' image - id: meta_build_deps - uses: docker/metadata-action@v4 - with: - images: dataquest/dspace-dependencies - tags: ${{ env.IMAGE_TAGS }} - flavor: ${{ env.TAGS_FLAVOR }} - - # https://github.com/docker/build-push-action - - name: Build and push 'dspace-dependencies' image - id: docker_build_deps - uses: docker/build-push-action@v3 - with: - context: . - file: ./Dockerfile.dependencies - platforms: ${{ env.PLATFORMS }} - # For pull requests, we run the Docker build (to ensure no PR changes break the build), - # but we ONLY do an image push to DockerHub if it's NOT a PR - push: ${{ github.event_name != 'pull_request' }} - # Use tags / labels provided by 'docker/metadata-action' above - tags: ${{ steps.meta_build_deps.outputs.tags }} - labels: ${{ steps.meta_build_deps.outputs.labels }} - - ####################################### - # Build/Push the 'dataquest/dspace' image - ####################################### - # Get Metadata for docker_build step below - - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace' image - id: meta_build - uses: docker/metadata-action@v4 - with: - images: dataquest/dspace - tags: ${{ env.IMAGE_TAGS }} - flavor: ${{ env.TAGS_FLAVOR }} - - - name: Build and push 'dspace' image - id: docker_build - uses: docker/build-push-action@v3 - with: - context: . - file: ./Dockerfile - platforms: ${{ env.PLATFORMS }} - # For pull requests, we run the Docker build (to ensure no PR changes break the build), - # but we ONLY do an image push to DockerHub if it's NOT a PR - push: ${{ github.event_name != 'pull_request' }} - # Use tags / labels provided by 'docker/metadata-action' above - tags: ${{ steps.meta_build.outputs.tags }} - labels: ${{ steps.meta_build.outputs.labels }} - - ##################################################### - # Build/Push the 'dataquest/dspace' image ('-test' tag) - ##################################################### - # Get Metadata for docker_build_test step below - - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-test' image - id: meta_build_test - uses: docker/metadata-action@v4 - with: - images: dataquest/dspace - tags: ${{ env.IMAGE_TAGS }} - # As this is a test/development image, its tags are all suffixed with "-test". Otherwise, it uses the same - # tagging logic as the primary 'dataquest/dspace' image above. - flavor: ${{ env.TAGS_FLAVOR }} - suffix=-test - - - name: Build and push 'dspace-test' image - id: docker_build_test - uses: docker/build-push-action@v3 - with: - context: . - file: ./Dockerfile.test - platforms: ${{ env.PLATFORMS }} - # For pull requests, we run the Docker build (to ensure no PR changes break the build), - # but we ONLY do an image push to DockerHub if it's NOT a PR - push: ${{ github.event_name != 'pull_request' }} - # Use tags / labels provided by 'docker/metadata-action' above - tags: ${{ steps.meta_build_test.outputs.tags }} - labels: ${{ steps.meta_build_test.outputs.labels }} - - ########################################### - # Build/Push the 'dataquest/dspace-cli' image - ########################################### - # Get Metadata for docker_build_test step below - - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-cli' image - id: meta_build_cli - uses: docker/metadata-action@v4 - with: - images: dataquest/dspace-cli - tags: ${{ env.IMAGE_TAGS }} - flavor: ${{ env.TAGS_FLAVOR }} - - - name: Build and push 'dspace-cli' image - id: docker_build_cli - uses: docker/build-push-action@v3 - with: - context: . - file: ./Dockerfile.cli - platforms: ${{ env.PLATFORMS }} - # For pull requests, we run the Docker build (to ensure no PR changes break the build), - # but we ONLY do an image push to DockerHub if it's NOT a PR - push: ${{ github.event_name != 'pull_request' }} - # Use tags / labels provided by 'docker/metadata-action' above - tags: ${{ steps.meta_build_cli.outputs.tags }} - labels: ${{ steps.meta_build_cli.outputs.labels }} diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 180e9a4d07cb..11152a6c0c8b 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -6,7 +6,7 @@ on: - '**' env: - IMAGE_BASE_NAME: dataquest/dspace + IMAGE_BASE_NAME: ufal/dspace jobs: retag-BE-image: