From 8b23eaa2956552735b05a5b26ad56226904d0181 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 10:53:28 +0200 Subject: [PATCH 01/17] wip --- .gitea/ci.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .gitea/ci.yml diff --git a/.gitea/ci.yml b/.gitea/ci.yml new file mode 100644 index 0000000..509cfd7 --- /dev/null +++ b/.gitea/ci.yml @@ -0,0 +1,46 @@ +name: CI +on: + push: + pull_request: + workflow_dispatch: + inputs: + BEC_WIDGETS_BRANCH: + description: "Branch of BEC Widgets to install" + required: false + type: string + BEC_CORE_BRANCH: + description: "Branch of BEC Core to install" + required: false + type: string + OPHYD_DEVICES_BRANCH: + description: "Branch of Ophyd Devices to install" + required: false + type: string + +permissions: + pull-requests: write + +jobs: + test: + runs-on: ubuntu-latest + defaults: + run: + shell: bash -el {0} + env: + QTWEBENGINE_DISABLE_SANDBOX: 1 + QT_QPA_PLATFORM: "offscreen" + + steps: + - name: Checkout Shared Actions Repo + uses: actions/checkout@v3 + with: + repository: bec/bec_shared_actions + + - name: Install and test a BEC plugin repository + uses: ./.github/actions/plugin_repo_tests + with: + BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH }} + BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH }} + OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH }} + BEC_PLUGIN_REPO_URL: "https://gitea.psi.ch/bec/phoenix_bec.git" + PYTHON_VERSION: "3.11" -- 2.49.0 From 02fb875acb3aa3500cf2f9eef81dd6bd9bb33116 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 10:55:46 +0200 Subject: [PATCH 02/17] wip --- .gitea/{ => workflows}/ci.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitea/{ => workflows}/ci.yml (100%) diff --git a/.gitea/ci.yml b/.gitea/workflows/ci.yml similarity index 100% rename from .gitea/ci.yml rename to .gitea/workflows/ci.yml -- 2.49.0 From c76846d80261abaebe93d7353030d0bd34254cfd Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 11:01:00 +0200 Subject: [PATCH 03/17] wip --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 509cfd7..1c302c6 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: steps: - name: Checkout Shared Actions Repo - uses: actions/checkout@v3 + uses: https://github.com/actions/checkout@v4 with: repository: bec/bec_shared_actions -- 2.49.0 From a9a026d070c9fbb09e76467eb6251abe6dbda9c1 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 11:02:58 +0200 Subject: [PATCH 04/17] wip --- .gitea/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 1c302c6..beaf997 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -36,11 +36,11 @@ jobs: with: repository: bec/bec_shared_actions - - name: Install and test a BEC plugin repository - uses: ./.github/actions/plugin_repo_tests - with: - BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH }} - BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH }} - OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH }} - BEC_PLUGIN_REPO_URL: "https://gitea.psi.ch/bec/phoenix_bec.git" - PYTHON_VERSION: "3.11" + # - name: Install and test a BEC plugin repository + # uses: ./.github/actions/plugin_repo_tests + # with: + # BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH }} + # BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH }} + # OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH }} + # BEC_PLUGIN_REPO_URL: "https://gitea.psi.ch/bec/phoenix_bec.git" + # PYTHON_VERSION: "3.11" -- 2.49.0 From 5567c6724d6ca626fc9368c8e78e94a66503ec66 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 11:07:32 +0200 Subject: [PATCH 05/17] wip --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index beaf997..a67343e 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: steps: - name: Checkout Shared Actions Repo - uses: https://github.com/actions/checkout@v4 + uses: actions/checkout@v4 with: repository: bec/bec_shared_actions -- 2.49.0 From 812e96089209305022f0be5dfbb05c581433c22a Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 11:08:37 +0200 Subject: [PATCH 06/17] wip --- .gitea/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index a67343e..07ed04f 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -35,6 +35,7 @@ jobs: uses: actions/checkout@v4 with: repository: bec/bec_shared_actions + ref: main # - name: Install and test a BEC plugin repository # uses: ./.github/actions/plugin_repo_tests -- 2.49.0 From d4fe5501565b48c3f2a40da89ca1b5b9ea92249a Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 11:09:52 +0200 Subject: [PATCH 07/17] wip --- .gitea/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 07ed04f..69834d6 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -37,11 +37,11 @@ jobs: repository: bec/bec_shared_actions ref: main - # - name: Install and test a BEC plugin repository - # uses: ./.github/actions/plugin_repo_tests - # with: - # BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH }} - # BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH }} - # OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH }} - # BEC_PLUGIN_REPO_URL: "https://gitea.psi.ch/bec/phoenix_bec.git" - # PYTHON_VERSION: "3.11" + - name: Install and test a BEC plugin repository + uses: bec/bec_shared_actions/.gitea/plugin_repo_tests + with: + BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH }} + BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH }} + OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH }} + BEC_PLUGIN_REPO_URL: "https://gitea.psi.ch/bec/phoenix_bec.git" + PYTHON_VERSION: "3.11" -- 2.49.0 From 3f4a87448a8a2cf349c2c46d24f07d417a67d953 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 11:12:09 +0200 Subject: [PATCH 08/17] wip --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 69834d6..7111765 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: ref: main - name: Install and test a BEC plugin repository - uses: bec/bec_shared_actions/.gitea/plugin_repo_tests + uses: bec/bec_shared_actions/.gitea/plugin_repo_tests@main with: BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH }} BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH }} -- 2.49.0 From 8856c2fa36ee14f03bf90e4c9ba55b4a715555ca Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 11:18:39 +0200 Subject: [PATCH 09/17] wip --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 7111765..dfce52b 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI +name: CI Beamline Plugin on: push: pull_request: -- 2.49.0 From 8306232f7a010d785f6e7bbad2421b1413458cda Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 13:05:33 +0200 Subject: [PATCH 10/17] wip --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index dfce52b..33a2c16 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI Beamline Plugin +name: CI Beamline on: push: pull_request: -- 2.49.0 From 1366b73b72756d0625f287f10abe4d12007f4328 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 13:09:55 +0200 Subject: [PATCH 11/17] wip --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 33a2c16..dfce52b 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI Beamline +name: CI Beamline Plugin on: push: pull_request: -- 2.49.0 From def0eb54ae5d41cb563495a7149120a7ede7f71c Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 6 Jun 2025 13:13:28 +0200 Subject: [PATCH 12/17] wip --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index dfce52b..33a2c16 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI Beamline Plugin +name: CI Beamline on: push: pull_request: -- 2.49.0 From cea2759b22f5140b52cd1a3222db1529698d34ca Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Thu, 12 Jun 2025 13:43:14 +0200 Subject: [PATCH 13/17] wip - absolute url --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 33a2c16..c026181 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: ref: main - name: Install and test a BEC plugin repository - uses: bec/bec_shared_actions/.gitea/plugin_repo_tests@main + uses: https://gitea.psi.ch/bec/bec_shared_actions/.gitea/plugin_repo_tests@main with: BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH }} BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH }} -- 2.49.0 From 7ff54bf79023b8b2f28e90e8cc2204d3ce04c69d Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 13 Jun 2025 18:48:26 +0200 Subject: [PATCH 14/17] wip --- .gitea/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index c026181..1adc984 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -38,10 +38,10 @@ jobs: ref: main - name: Install and test a BEC plugin repository - uses: https://gitea.psi.ch/bec/bec_shared_actions/.gitea/plugin_repo_tests@main + uses: https://gitea.psi.ch/bec/bec_shared_actions/.gitea/plugin_repo_tests.git@main with: - BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH }} - BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH }} - OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH }} + BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }} + BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || 'main' }} + OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main' }} BEC_PLUGIN_REPO_URL: "https://gitea.psi.ch/bec/phoenix_bec.git" PYTHON_VERSION: "3.11" -- 2.49.0 From 3d5dcf32919603aeeafc0e5efe9a001d0d6cf94e Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 13 Jun 2025 18:49:16 +0200 Subject: [PATCH 15/17] wip --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 1adc984..cbf941c 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: ref: main - name: Install and test a BEC plugin repository - uses: https://gitea.psi.ch/bec/bec_shared_actions/.gitea/plugin_repo_tests.git@main + uses: https://gitea.psi.ch/bec/bec_shared_actions/.gitea/plugin_repo_tests@main with: BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }} BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || 'main' }} -- 2.49.0 From 0615024342324f73e8eb5c6df43ef323c5802554 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 13 Jun 2025 19:06:13 +0200 Subject: [PATCH 16/17] wip --- .gitea/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index cbf941c..2308a25 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -44,4 +44,5 @@ jobs: BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || 'main' }} OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main' }} BEC_PLUGIN_REPO_URL: "https://gitea.psi.ch/bec/phoenix_bec.git" + BEC_PLUGIN_REPO_BRANCH: ${{ gitea.ref_name || 'main' }} PYTHON_VERSION: "3.11" -- 2.49.0 From cea3f32322cc808142f857927033f00b2529a9c9 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Mon, 16 Jun 2025 09:40:38 +0200 Subject: [PATCH 17/17] wip - test failed pipeline --- tests/tests_devices/test_phoenix_trigger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_devices/test_phoenix_trigger.py b/tests/tests_devices/test_phoenix_trigger.py index 9e84132..5978afa 100644 --- a/tests/tests_devices/test_phoenix_trigger.py +++ b/tests/tests_devices/test_phoenix_trigger.py @@ -16,7 +16,7 @@ def mock_trigger(): name = "phoenix_trigger" prefix = "X07MB-OP2:" dm = DMMock() - with mock.patch.object(dm, "connector"): + with mock.patch.object(dm, "connecto"): with ( mock.patch( "ophyd_devices.interfaces.base_classes.bec_device_base.FileWriter" -- 2.49.0