From b6431a4b8fbe7239f73705d4db6e98f4f2b5c200 Mon Sep 17 00:00:00 2001 From: Ondrej Kosarko Date: Thu, 20 Jun 2024 22:18:13 +0200 Subject: [PATCH 1/2] update workflows to use ufal instead of dataquest-dev --- .../create_bitstreams.yml | 0 .../deploy.yml | 0 .../erase_db.yml | 0 .../new_issue_assign.yml | 0 .github/workflows/build.yml | 6 ++--- .github/workflows/docker.yml | 25 ++++++------------- .github/workflows/tag-release.yml | 2 +- 7 files changed, 12 insertions(+), 21 deletions(-) rename .github/{workflows => disabled-workflows}/create_bitstreams.yml (100%) rename .github/{workflows => disabled-workflows}/deploy.yml (100%) rename .github/{workflows => disabled-workflows}/erase_db.yml (100%) rename .github/{workflows => disabled-workflows}/new_issue_assign.yml (100%) diff --git a/.github/workflows/create_bitstreams.yml b/.github/disabled-workflows/create_bitstreams.yml similarity index 100% rename from .github/workflows/create_bitstreams.yml rename to .github/disabled-workflows/create_bitstreams.yml diff --git a/.github/workflows/deploy.yml b/.github/disabled-workflows/deploy.yml similarity index 100% rename from .github/workflows/deploy.yml rename to .github/disabled-workflows/deploy.yml diff --git a/.github/workflows/erase_db.yml b/.github/disabled-workflows/erase_db.yml similarity index 100% rename from .github/workflows/erase_db.yml rename to .github/disabled-workflows/erase_db.yml 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 6792fc83157..1387bdd664a 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: @@ -22,8 +22,8 @@ jobs: # Direct that step to utilize a DSpace REST service that has been started in docker. # Spin up UI on 127.0.0.1 to avoid host resolution issues in e2e tests with Node 18+ INSTANCE: '2' - DSPACE_CI_IMAGE: 'dataquest/dspace:dspace-7_x-test' - DSPACE_SOLR_IMAGE: dataquest/dspace-solr:dspace-7_x + DSPACE_CI_IMAGE: 'ufal/dspace:dspace-7_x-test' + DSPACE_SOLR_IMAGE: ufal/dspace-solr:dspace-7_x DSPACE_REST_HOST: 127.0.0.1 DSPACE_REST_PORT: 8080 DSPACE_REST_NAMESPACE: '/server' diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 54b79bee00b..c8f9e87a338 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,7 +9,7 @@ name: Docker images on: push: branches: - - dtq-dev + - clarin-v7 - customer/* pull_request: workflow_dispatch: @@ -20,11 +20,11 @@ permissions: jobs: dspace-angular: # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular' - if: github.repository == 'dataquest-dev/dspace-angular' - uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev + if: github.repository == 'ufal/dspace-angular' + uses: ufal/DSpace/.github/workflows/reusable-docker-build.yml@clarin-v7 with: build_id: dspace-angular - image_name: dataquest/dspace-angular + image_name: ufal/dspace-angular dockerfile_path: ./Dockerfile run_python_version_script: true python_version_script_dest: src/static-files/VERSION_D.html @@ -33,12 +33,12 @@ jobs: DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} ############################################################# - # Build/Push the 'dataquest/dspace-angular' image ('-dist' tag) + # Build/Push the 'ufal/dspace-angular' image ('-dist' tag) ############################################################# dspace-angular-dist: - # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace-angular' - if: github.repository == 'dataquest-dev/dspace-angular' && false # not used for now - uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev + # Ensure this job never runs on forked repos. It's only executed for 'ufal/dspace-angular' + if: github.repository == 'ufal/dspace-angular' && false # not used for now + uses: ufal/DSpace/.github/workflows/reusable-docker-build.yml@clarin-v7 with: build_id: dspace-angular-dist image_name: dspace/dspace-angular @@ -51,12 +51,3 @@ jobs: secrets: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} - - deploy: - needs: dspace-angular - uses: dataquest-dev/dspace-angular/.github/workflows/deploy.yml@dtq-dev - if: ${{ github.event_name != 'pull_request' }} - with: - INSTANCE: '5' - IMPORT: false - secrets: inherit diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 5717f1a89f2..4c09e1b027b 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -6,7 +6,7 @@ on: - '**' env: - IMAGE_BASE_NAME: dataquest/dspace-angular + IMAGE_BASE_NAME: ufal/dspace-angular jobs: retag-FE-image: From 7d6138cd9b02f89b941ae30330255f2f8117a0be Mon Sep 17 00:00:00 2001 From: Ondrej Kosarko Date: Thu, 20 Jun 2024 23:33:03 +0200 Subject: [PATCH 2/2] fix paths --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c8f9e87a338..17c4492c62b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -21,7 +21,7 @@ jobs: dspace-angular: # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular' if: github.repository == 'ufal/dspace-angular' - uses: ufal/DSpace/.github/workflows/reusable-docker-build.yml@clarin-v7 + uses: ufal/clarin-dspace/.github/workflows/reusable-docker-build.yml@clarin-v7 with: build_id: dspace-angular image_name: ufal/dspace-angular @@ -38,7 +38,7 @@ jobs: dspace-angular-dist: # Ensure this job never runs on forked repos. It's only executed for 'ufal/dspace-angular' if: github.repository == 'ufal/dspace-angular' && false # not used for now - uses: ufal/DSpace/.github/workflows/reusable-docker-build.yml@clarin-v7 + uses: ufal/clarin-dspace/.github/workflows/reusable-docker-build.yml@clarin-v7 with: build_id: dspace-angular-dist image_name: dspace/dspace-angular