Skip to content

Commit a2c8f5a

Browse files
Add IMAGE_OS variable (#588)
* use justfile v2 * use IMAGE_OS to avoid errors * pass image_os to docker * pass image_os to docker * fix image_os name
1 parent 74b7f68 commit a2c8f5a

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/deploy_tests.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- 3.8.10
3737
- 3.9.5
3838
steps:
39-
- uses: extractions/setup-just@v1
39+
- uses: extractions/setup-just@v2
4040
env:
4141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4242
- uses: actions/checkout@v4
@@ -78,6 +78,7 @@ jobs:
7878
QUARTO_VERSION: "1.4.546"
7979
# This allows us to start Connect separately in our own docker container
8080
CONNECT_SERVER: "http://localhost:3939"
81+
IMAGE_OS: "rstudio/connect:ubuntu22"
8182
remote: "yes"
8283
run: |
8384
cd integration-testing

.github/workflows/main.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ jobs:
215215
fetch-depth: 0
216216
env:
217217
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
218-
- uses: extractions/setup-just@v1
218+
- uses: extractions/setup-just@v2
219219
env:
220220
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
221221
- name: Build Containers
@@ -261,7 +261,7 @@ jobs:
261261
- 3.8.10
262262
- 3.9.5
263263
steps:
264-
- uses: extractions/setup-just@v1
264+
- uses: extractions/setup-just@v2
265265
env:
266266
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
267267
- uses: actions/checkout@v4
@@ -303,6 +303,7 @@ jobs:
303303

304304
# This allows us to start Connect separately in our own docker container
305305
CONNECT_SERVER: "http://localhost:3939"
306+
IMAGE_OS: "rstudio/connect:ubuntu22"
306307
remote: "yes"
307308
run: |
308309
cd integration-testing

integration-testing/docker-compose.yml

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ services:
3535
QUARTO_VERSION: ${QUARTO_VERSION}
3636
PY_VERSION: ${PY_VERSION}
3737
API_KEY: ${ADMIN_API_KEY}
38+
IMAGE_OS: ${IMAGE_OS}
3839

3940
# customized connect built with updated quarto version
4041
# used for nightly deploy_tests.yml that include quarto projects

0 commit comments

Comments
 (0)