Skip to content

Commit a465ad4

Browse files
authored
Merge pull request #645 from DeepRank/release_3.1.0_gcroci2
release: v3.1.0
2 parents 9e59b7e + e8e31f3 commit a465ad4

37 files changed

+1842
-1361
lines changed

.bumpversion.cfg

Lines changed: 0 additions & 17 deletions
This file was deleted.

.bumpversion.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[tool.bumpversion]
2+
current_version = "3.1.0"
3+
4+
[[tool.bumpversion.files]]
5+
filename = "pyproject.toml"
6+
search = 'version = "{current_version}"'
7+
replace = 'version = "{new_version}"'
8+
9+
[[tool.bumpversion.files]]
10+
filename = "CITATION.cff"
11+
search = 'version: "{current_version}"'
12+
replace = 'version: "{new_version}"'
13+
14+
[[tool.bumpversion.files]]
15+
filename = "deeprank2/__init__.py"
16+
search = '__version__ = "{current_version}"'
17+
replace = '__version__ = "{new_version}"'

.github/workflows/_ghcr.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
2+
# SPDX-FileCopyrightText: 2022 dv4all
3+
# SPDX-FileCopyrightText: 2024 Ewan Cahen (Netherlands eScience Center) <e.cahen@esciencecenter.nl>
4+
# SPDX-FileCopyrightText: 2024 Netherlands eScience Center
5+
#
6+
# SPDX-License-Identifier: Apache-2.0
7+
8+
name: reusable ghcr.io module
9+
10+
on:
11+
workflow_call:
12+
inputs:
13+
ghcr_user:
14+
required: true
15+
description: User for logging to ghcr.io (use github.actor)
16+
type: string
17+
base_image_name:
18+
required: true
19+
description: Base image name incl. ghcr.io
20+
type: string
21+
image_tag:
22+
required: true
23+
description: Image tag (version)
24+
type: string
25+
dockerfile:
26+
required: true
27+
description: Location and name of docker file
28+
type: string
29+
docker_context:
30+
required: true
31+
description: Docker context for the build command
32+
type: string
33+
secrets:
34+
token:
35+
required: true
36+
outputs:
37+
image_created:
38+
description: Full image name after upload to ghcr.io
39+
value: ${{jobs.build_and_push.outputs.image_build}}
40+
image_uploaded:
41+
description: Confirmation that image is uploaded to ghcr.io
42+
value: ${{jobs.build_and_push.outputs.image_pushed}}
43+
44+
jobs:
45+
build_and_push:
46+
name: build and push image
47+
runs-on: ubuntu-22.04
48+
outputs:
49+
image_build: ${{steps.build_image.outputs.image_build}}
50+
image_pushed: ${{steps.build_image.outputs.image_pushed}}
51+
steps:
52+
- name: checkout
53+
# https://github.com/actions/checkout
54+
uses: actions/checkout@v4
55+
- name: build
56+
id: build_image
57+
run: |
58+
IMAGE_TAG_VERSION=${{inputs.base_image_name}}:${{inputs.image_tag}}
59+
IMAGE_TAG_LASTEST=${{inputs.base_image_name}}:latest
60+
echo image_tag_version $IMAGE_TAG_VERSION
61+
docker build -t $IMAGE_TAG_VERSION -t $IMAGE_TAG_LASTEST -f ${{inputs.dockerfile}} ${{inputs.docker_context}}
62+
echo "{image_build}={$IMAGE_TAG_VERSIONvalue}" >> $GITHUB_OUTPUT
63+
- name: push to ghcr.io
64+
id: push_image
65+
run: |
66+
echo login
67+
echo "${{secrets.token}}" | docker login https://ghcr.io -u ${{inputs.ghcr_user}} --password-stdin
68+
echo push auth image with all tags
69+
docker push ${{inputs.base_image_name}} --all-tags
70+
echo "{image_build}={$IMAGE_TAG_VERSIONvalue}" >> $GITHUB_OUTPUT

.github/workflows/build-latest-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: build (latest release)
33
# Only trigger, when the release workflow succeeded
44
on:
55
workflow_run:
6-
workflows: ["Build and upload to PyPI"]
6+
workflows: ["Build and upload to PyPI and ghcr.io"]
77
types:
88
- completed
99

@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: ["ubuntu-latest"]
18+
os: ["ubuntu-22.04"]
1919
python-version: ["3.10"] # ["3.10", "3.11"]
2020

2121
# https://github.com/marketplace/actions/setup-miniconda#use-a-default-shell

.github/workflows/build-repo-frozen-env.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
os: ["ubuntu-latest"]
39+
os: ["ubuntu-22.04"]
4040
python-version: ["3.10"] # ["3.10", "3.11"]
4141

4242
# https://github.com/marketplace/actions/setup-miniconda#use-a-default-shell

.github/workflows/build-repo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
os: ["ubuntu-latest"]
39+
os: ["ubuntu-22.04"]
4040
python-version: ["3.10"] # ["3.10", "3.11"]
4141

4242
# https://github.com/marketplace/actions/setup-miniconda#use-a-default-shell

.github/workflows/cffconvert.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
validate:
1010
name: "validate"
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Check out a copy of the repository
1414
uses: actions/checkout@v3

.github/workflows/coveralls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
os: ["ubuntu-latest"]
39+
os: ["ubuntu-22.04"]
4040
python-version: ["3.10"]
4141

4242
# https://github.com/marketplace/actions/setup-miniconda#use-a-default-shell

.github/workflows/draft-pdf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
paper:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-22.04
99
name: Paper Draft
1010
steps:
1111
- name: Checkout

.github/workflows/fair-software.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
verify:
1212
if: github.event.pull_request.draft == false
1313
name: "fair-software"
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-22.04
1515
steps:
1616
- uses: fair-software/howfairis-github-action@0.2.1
1717
name: Measure compliance with fair-software.eu recommendations

0 commit comments

Comments
 (0)