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 #1119

Merged
merged 1 commit 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
2 changes: 1 addition & 1 deletion .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 Down
80 changes: 32 additions & 48 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand All @@ -57,53 +57,53 @@ 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 }}
DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}


###########################################
# 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/'
Expand All @@ -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/
Expand All @@ -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\"}"
169 changes: 0 additions & 169 deletions .github/workflows/migrate-docker.yml

This file was deleted.

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
IMAGE_BASE_NAME: ufal/dspace

jobs:
retag-BE-image:
Expand Down
Loading