Merge branch 'clarin-v7' into customer/uk

ufal · Jul 10, 2024 · 23d6b35 · 23d6b35
2 parents 9ab4576 + 22dacc0
commit 23d6b35
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 592 deletions.
diff --git a/.github/workflows/create_bitstreams.yml → .../disabled-workflows/create_bitstreams.yml b/.github/workflows/create_bitstreams.yml → .../disabled-workflows/create_bitstreams.yml
diff --git a/.github/workflows/deploy.yml → .github/disabled-workflows/deploy.yml b/.github/workflows/deploy.yml → .github/disabled-workflows/deploy.yml
diff --git a/.github/workflows/erase_db.yml → .github/disabled-workflows/erase_db.yml b/.github/workflows/erase_db.yml → .github/disabled-workflows/erase_db.yml
diff --git a/.github/workflows/new_issue_assign.yml → ...b/disabled-workflows/new_issue_assign.yml b/.github/workflows/new_issue_assign.yml → ...b/disabled-workflows/new_issue_assign.yml
diff --git 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:customer-uk-test'
-      DSPACE_SOLR_IMAGE: dataquest/dspace-solr:customer-uk
+      DSPACE_CI_IMAGE: 'ufal/dspace:customer-uk-test'
+      DSPACE_SOLR_IMAGE: ufal/dspace-solr:customer-uk
       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
@@ -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/clarin-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/clarin-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@customer/uk
-    if: ${{ github.event_name != 'pull_request' }}
-    with:
-      INSTANCE: '2'
-      IMPORT: false
-    secrets: inherit
diff --git 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: