From 591fe424b04910d59cdf7f56437ef415bcab58ba Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Fri, 23 Aug 2024 14:01:00 +0100 Subject: [PATCH 1/3] Move pre release workflow --- .github/workflows/ci.yml | 12 ++++++------ .../workflows/pin_versions.py | 0 .../workflows/pre_release_workflow.yml | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename {hyperion_other => .github}/workflows/pin_versions.py (100%) rename {hyperion_other => .github}/workflows/pre_release_workflow.yml (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00cc5a577..4906989d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,12 +52,12 @@ jobs: if: needs.check.outputs.branch-pr == '' uses: ./.github/workflows/_dist.yml - pypi: - if: github.ref_type == 'tag' - needs: dist - uses: ./.github/workflows/_pypi.yml - permissions: - id-token: write + # pypi: + # if: github.ref_type == 'tag' + # needs: dist + # uses: ./.github/workflows/_pypi.yml + # permissions: + # id-token: write release: if: github.ref_type == 'tag' diff --git a/hyperion_other/workflows/pin_versions.py b/.github/workflows/pin_versions.py similarity index 100% rename from hyperion_other/workflows/pin_versions.py rename to .github/workflows/pin_versions.py diff --git a/hyperion_other/workflows/pre_release_workflow.yml b/.github/workflows/pre_release_workflow.yml similarity index 100% rename from hyperion_other/workflows/pre_release_workflow.yml rename to .github/workflows/pre_release_workflow.yml From db26194716b8bec0975ab8748bd4b769684a2f9a Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Fri, 23 Aug 2024 14:03:32 +0100 Subject: [PATCH 2/3] Do pre release commits under the correct name --- .github/workflows/pre_release_workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre_release_workflow.yml b/.github/workflows/pre_release_workflow.yml index 70744043e..28a3d0d53 100644 --- a/.github/workflows/pre_release_workflow.yml +++ b/.github/workflows/pre_release_workflow.yml @@ -34,8 +34,8 @@ jobs: git add setup.cfg - name: Commit changes run: | - git config --global user.name "GitHub Workflow" - git config --global user.email "robert.tuck@diamond.ac.uk" + git config --global user.name "${{ github.actor }}" + git config --global user.email "${{ github.actor }}@users.noreply.github.com" git commit -m ${{steps.pin_versions.outputs.COMMIT_MESSAGE}} git tag ${{inputs.tagName}} git push origin ${{inputs.tagName}} From 9f0936e5bf21fbe6b3380dfad7260a7108b8e0f1 Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Fri, 23 Aug 2024 14:04:44 +0100 Subject: [PATCH 3/3] unpin dodal for testing --- hyperion_other/workflows/test_data/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyperion_other/workflows/test_data/setup.cfg b/hyperion_other/workflows/test_data/setup.cfg index e16c14c2f..dac870988 100644 --- a/hyperion_other/workflows/test_data/setup.cfg +++ b/hyperion_other/workflows/test_data/setup.cfg @@ -29,7 +29,7 @@ install_requires = opentelemetry-exporter-jaeger ophyd semver - dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@0aabdb389f65a30e629cec60a36c3b5298b7647f + dls-dodal pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774 scipy pyzmq