From b285b3b9bb1eb86e464ca6f57d9127928ebce9c1 Mon Sep 17 00:00:00 2001 From: Kevin Gartland Date: Fri, 10 May 2024 09:13:52 -0400 Subject: [PATCH 1/4] use justfile v2 --- .github/workflows/deploy_tests.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_tests.yml b/.github/workflows/deploy_tests.yml index 5c1e13fa..f0a9acdb 100644 --- a/.github/workflows/deploy_tests.yml +++ b/.github/workflows/deploy_tests.yml @@ -36,7 +36,7 @@ jobs: - 3.8.10 - 3.9.5 steps: - - uses: extractions/setup-just@v1 + - uses: extractions/setup-just@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: actions/checkout@v4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 70d33771..a696e52f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -215,7 +215,7 @@ jobs: fetch-depth: 0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: extractions/setup-just@v1 + - uses: extractions/setup-just@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build Containers From 0051e7c636e45a1a1e84b467765fbb797214c2e6 Mon Sep 17 00:00:00 2001 From: Kevin Gartland Date: Fri, 10 May 2024 09:54:19 -0400 Subject: [PATCH 2/4] use IMAGE_OS to avoid errors --- .github/workflows/deploy_tests.yml | 1 + .github/workflows/main.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy_tests.yml b/.github/workflows/deploy_tests.yml index f0a9acdb..efb255eb 100644 --- a/.github/workflows/deploy_tests.yml +++ b/.github/workflows/deploy_tests.yml @@ -78,6 +78,7 @@ jobs: QUARTO_VERSION: "1.4.546" # This allows us to start Connect separately in our own docker container CONNECT_SERVER: "http://localhost:3939" + IMAGE_OS: "ubuntu22" remote: "yes" run: | cd integration-testing diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a696e52f..d723ba3f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -261,7 +261,7 @@ jobs: - 3.8.10 - 3.9.5 steps: - - uses: extractions/setup-just@v1 + - uses: extractions/setup-just@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: actions/checkout@v4 @@ -303,6 +303,7 @@ jobs: # This allows us to start Connect separately in our own docker container CONNECT_SERVER: "http://localhost:3939" + IMAGE_OS: "ubuntu22" remote: "yes" run: | cd integration-testing From 6544d780e8b69dd2fbb4b3fa76e5203335295654 Mon Sep 17 00:00:00 2001 From: Kevin Gartland Date: Fri, 10 May 2024 10:07:07 -0400 Subject: [PATCH 3/4] pass image_os to docker --- integration-testing/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/integration-testing/docker-compose.yml b/integration-testing/docker-compose.yml index b60f9265..e7b83b1c 100644 --- a/integration-testing/docker-compose.yml +++ b/integration-testing/docker-compose.yml @@ -26,6 +26,7 @@ services: args: QUARTO_VERSION: ${QUARTO_VERSION} PY_VERSION: ${PY_VERSION} + IMAGE_OS: ${IMAGE_OS} volumes: - ../:/rsconnect-python working_dir: /rsconnect-python/integration-testing From c8df0e2f8f7b002894782f566ae2919dfe3c0f62 Mon Sep 17 00:00:00 2001 From: Kevin Gartland Date: Fri, 10 May 2024 10:15:43 -0400 Subject: [PATCH 4/4] pass image_os to docker --- integration-testing/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-testing/docker-compose.yml b/integration-testing/docker-compose.yml index e7b83b1c..2ca1db0a 100644 --- a/integration-testing/docker-compose.yml +++ b/integration-testing/docker-compose.yml @@ -26,7 +26,6 @@ services: args: QUARTO_VERSION: ${QUARTO_VERSION} PY_VERSION: ${PY_VERSION} - IMAGE_OS: ${IMAGE_OS} volumes: - ../:/rsconnect-python working_dir: /rsconnect-python/integration-testing @@ -36,6 +35,7 @@ services: QUARTO_VERSION: ${QUARTO_VERSION} PY_VERSION: ${PY_VERSION} API_KEY: ${ADMIN_API_KEY} + IMAGE_OS: ${IMAGE_OS} # customized connect built with updated quarto version # used for nightly deploy_tests.yml that include quarto projects