From 51bcecd1eaac499b96c26b5fb8e96ff1d6501761 Mon Sep 17 00:00:00 2001 From: enitu Date: Wed, 16 Apr 2025 09:46:00 +0200 Subject: [PATCH 1/2] actions: choose override branch --- .github/workflows/docker.yml | 16 +++++++++++++++- .gitignore | 3 +++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 677a417..d26c2ee 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,6 +11,11 @@ on: tags: - 'v*' workflow_dispatch: + inputs: + invenio-override-branch: + description: 'invenio-override repo branch' + required: false + default: 'main' jobs: @@ -38,7 +43,16 @@ jobs: mkdir .venv uv venv .venv source .venv/bin/activate - uv pip install git+https://github.com/sharedRDM/invenio-override@main + install_cmd='uv pip install git+https://github.com/sharedRDM/invenio-override@' + install_cmd_with_branch='${install_cmd}${{ github.event.inputs.invenio-override-branch }}' + eval "$install_cmd_with_branch" + + - name: Change pyproject.toml + run: sed -i 's/invenio-override", branch = "main"/invenio-override", branch = "${{ github.event.inputs.invenio-override-branch }}"/g' pyproject.toml + + - name: Relock uv + run: | + source .venv/bin/activate uv lock --upgrade deactivate rm -rf .venv diff --git a/.gitignore b/.gitignore index 48286f1..315089e 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,6 @@ data/.minio.sys # Celery celerybeat-schedule* + +# IDEs +.idea/ From 765a102472361215e5d5c99f870cfee9b934fdc6 Mon Sep 17 00:00:00 2001 From: enitu Date: Wed, 16 Apr 2025 09:55:17 +0200 Subject: [PATCH 2/2] update: runner ubuntu version --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d26c2ee..d719709 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -20,7 +20,7 @@ on: jobs: build-and-push-mug: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 permissions: contents: read packages: write @@ -49,7 +49,7 @@ jobs: - name: Change pyproject.toml run: sed -i 's/invenio-override", branch = "main"/invenio-override", branch = "${{ github.event.inputs.invenio-override-branch }}"/g' pyproject.toml - + - name: Relock uv run: | source .venv/bin/activate @@ -95,7 +95,7 @@ jobs: build-and-push-theme: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 permissions: contents: read packages: write