From 7f3a1f306fa9c3dcd545ec41446ab90167b2704a Mon Sep 17 00:00:00 2001 From: Alex Moriarty Date: Mon, 15 Jan 2024 23:15:31 -0400 Subject: [PATCH 1/3] Read .env to get studio tag (#174) * Read .env to get studio tag - Default main branch to main tag of studio NOTE: This change assumes that as part of the release process the .env file is updated when releases are created to point to the correct studio tag Signed-off-by: Alex Moriarty * Schedule CI Every 6 hr Mon-Fri Triggering to test with main branch of studio on a regular schedule Signed-off-by: Alex Moriarty --------- Signed-off-by: Alex Moriarty --- .env | 2 +- .github/workflows/ci.yaml | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.env b/.env index a4d52573..20a18c53 100644 --- a/.env +++ b/.env @@ -5,7 +5,7 @@ STUDIO_CONFIG_PACKAGE=picknik_ur_mock_hw_config # MoveIt Studio version tag # Be careful! Changing this without understanding the consequences may break your installation. -STUDIO_DOCKER_TAG=2.11.0 +STUDIO_DOCKER_TAG=main # Licensing -- enter your MoveIt Studio license below STUDIO_LICENSE_KEY= diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6f88ff1a..bd1a328c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,8 +4,22 @@ on: branches: [main] pull_request: workflow_dispatch: + # Run every 6 hours Mon-Fri + schedule: + - chron: "* */6 * * 1-5" + jobs: + setup: + runs-on: ubuntu-latest + outputs: + image_tag: ${{ steps.dotenv.outputs.studio_docker_tag }} + steps: + - uses: actions/checkout@v4 + - id: dotenv + uses: falti/dotenv-action@v1.0.4 + integration-test-in-studio-container: + needs: setup runs-on: ubuntu-latest env: STUDIO_LICENSE_KEY: ${{ secrets.STUDIO_CI_LICENSE_KEY }} @@ -18,7 +32,7 @@ jobs: CYCLONEDDS_URI: /tmp/cyclonedds.xml # TODO: docker tag # TODO: example for custom base images - container: picknikciuser/moveit-studio:main + container: picknikciuser/moveit-studio:${{ needs.setup.outputs.image_tag }} steps: - uses: actions/checkout@v4 # The lo interfaces will not have multicast, and will barf trying to claim a participant index From 1fd1ae947643e4ef7ed805449e3c98eeedf351d1 Mon Sep 17 00:00:00 2001 From: Alex Moriarty Date: Mon, 15 Jan 2024 23:25:10 -0400 Subject: [PATCH 2/3] fixup typo from PR #174 (#175) typo: chron -> cron Schedule jobs are not run as part of the PR found only after merge Signed-off-by: Alex Moriarty --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bd1a328c..101360d6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,7 +6,7 @@ on: workflow_dispatch: # Run every 6 hours Mon-Fri schedule: - - chron: "* */6 * * 1-5" + - cron: "* */6 * * 1-5" jobs: setup: From 2ce171ec29bf4fe3abde7191b355d2ef6e8d0a00 Mon Sep 17 00:00:00 2001 From: Alex Moriarty Date: Fri, 26 Jan 2024 12:33:01 -0400 Subject: [PATCH 3/3] set STUDIO_DOCKER_TAG=3.0.0 fo v3 branch Signed-off-by: Alex Moriarty --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 20a18c53..b03290be 100644 --- a/.env +++ b/.env @@ -5,7 +5,7 @@ STUDIO_CONFIG_PACKAGE=picknik_ur_mock_hw_config # MoveIt Studio version tag # Be careful! Changing this without understanding the consequences may break your installation. -STUDIO_DOCKER_TAG=main +STUDIO_DOCKER_TAG=3.0.0 # Licensing -- enter your MoveIt Studio license below STUDIO_LICENSE_KEY=