Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update workflows #4

Merged
merged 2 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Build
on:
push:
branches:
- dtq-dev
- clarin-v7
- customer/*
pull_request:

Expand All @@ -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'
Expand Down
25 changes: 8 additions & 17 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: Docker images
on:
push:
branches:
- dtq-dev
- clarin-v7
- customer/*
pull_request:
workflow_dispatch:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/tag-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- '**'

env:
IMAGE_BASE_NAME: dataquest/dspace-angular
IMAGE_BASE_NAME: ufal/dspace-angular

jobs:
retag-FE-image:
Expand Down
Loading