Skip to content

Add IMAGE_OS variable #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 10, 2024
Merged

Add IMAGE_OS variable #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b285b3b
use justfile v2
kgartland-rstudio May 10, 2024
0051e7c
use IMAGE_OS to avoid errors
kgartland-rstudio May 10, 2024
6544d78
pass image_os to docker
kgartland-rstudio May 10, 2024
c8df0e2
pass image_os to docker
kgartland-rstudio May 10, 2024
c6eed4b
fix image_os name
kgartland-rstudio May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/deploy_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: "rstudio/connect:ubuntu22"
remote: "yes"
run: |
cd integration-testing
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -303,6 +303,7 @@ jobs:

# This allows us to start Connect separately in our own docker container
CONNECT_SERVER: "http://localhost:3939"
IMAGE_OS: "rstudio/connect:ubuntu22"
remote: "yes"
run: |
cd integration-testing
Expand Down
1 change: 1 addition & 0 deletions integration-testing/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,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
Expand Down