Skip to content
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

Jump to bottom

Merge dev to main #817

Merged
merged 8 commits into from
Jul 22, 2024
Merged

Merge dev to main #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5a080bd
* Upgrade VS Code Extensions
kelli-rstudio Jul 5, 2024
bef6d3d
Merge pull request #812 from rstudio/kf-update-vscode-extensions
kelli-rstudio Jul 5, 2024
ba48276
Implement Snyk CLI scanning (#811)
ianpittwood Jul 15, 2024
a62b9b3
add rspm bash completions to the image
colearendt Jul 15, 2024
fe5f9be
Merge pull request #815 from rstudio/add-rspm-completions
colearendt Jul 16, 2024
7ac3377
Workbench configuration and certificate bug patches (#813)
ianpittwood Jul 19, 2024
2a40e4f
Implement shared scripts in WGCW image (#816)
ianpittwood Jul 22, 2024
6f7c47a
Manage TinyTeX installation with Quarto (#814)
ianpittwood Jul 22, 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
44 changes: 43 additions & 1 deletion .github/actions/bake-test-push/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ inputs:
description: Flag to test image once built
default: true
type: boolean
scan-image:
description: Flag to scan image for vulnerabilities once built
default: true
type: boolean
push-image:
description: Flag to push image once built
default: false
Expand All @@ -37,6 +41,14 @@ inputs:
description: JSON for authenticating Google Cloud Platform
default: ""
type: string
snyk-org:
description: Organization ID for Snyk
default: ""
type: string
snyk-token:
description: Token for authenticating with Snyk
default: ""
type: string

runs:
using: "composite"
Expand All @@ -47,6 +59,13 @@ runs:
env:
GITHUB_TOKEN: ${{ inputs.ghcr-token }}

- uses: snyk/actions/setup@master

- name: Snyk auth
shell: bash
run: |
snyk auth ${{ inputs.snyk-token }}

- uses: actions/setup-python@v5
with:
python-version: '3.12'
Expand Down Expand Up @@ -109,7 +128,30 @@ runs:
- name: Test
shell: bash
run: |
just test "${{ inputs.target }}" "${{ inputs.bakefile }}"
if [[ "${{ inputs.test-image }}" == "true" ]]; then
just test "${{ inputs.target }}" "${{ inputs.bakefile }}"
fi

- name: Scan
continue-on-error: true
env:
SNYK_ORG: ${{ inputs.snyk-org }}
shell: bash
run: |
if [[ "${{ inputs.scan-image }}" == "true" ]]; then
if [[ "${{ inputs.push-image }}" == "true" ]]; then
just snyk-monitor "${{ inputs.target }}" "${{ inputs.bakefile }}"
else
just snyk-test "${{ inputs.target }}" "${{ inputs.bakefile }}"
fi
fi

- name: Upload results
uses: github/codeql-action/upload-sarif@v3
continue-on-error: true
with:
sarif_file: "container.sarif"
category: "${{ inputs.target }}-snyk-vulnerabilities"

- name: Push - ${{ inputs.push-image }}
uses: docker/bake-action@v4
Expand Down
180 changes: 0 additions & 180 deletions .github/actions/build-test-scan-push/action.yaml
View file
Open in desktop

This file was deleted.

18 changes: 18 additions & 0 deletions .github/workflows/build-bake-preview.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ jobs:
ghcr-token: ${{ secrets.GITHUB_TOKEN }}
dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
snyk-org: ${{ secrets.SNYK_ORG }}
snyk-token: '${{ secrets.SNYK_TOKEN }}'

connect-daily:
needs: [versions]
Expand Down Expand Up @@ -137,6 +139,8 @@ jobs:
ghcr-token: ${{ secrets.GITHUB_TOKEN }}
dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
snyk-org: ${{ secrets.SNYK_ORG }}
snyk-token: '${{ secrets.SNYK_TOKEN }}'

connect-content-init-daily:
needs: [versions]
Expand Down Expand Up @@ -175,6 +179,8 @@ jobs:
ghcr-token: ${{ secrets.GITHUB_TOKEN }}
dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
snyk-org: ${{ secrets.SNYK_ORG }}
snyk-token: '${{ secrets.SNYK_TOKEN }}'

package-manager-preview:
needs: [versions]
Expand Down Expand Up @@ -213,6 +219,8 @@ jobs:
ghcr-token: ${{ secrets.GITHUB_TOKEN }}
dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
snyk-org: ${{ secrets.SNYK_ORG }}
snyk-token: '${{ secrets.SNYK_TOKEN }}'

package-manager-daily:
needs: [versions]
Expand Down Expand Up @@ -251,6 +259,8 @@ jobs:
ghcr-token: ${{ secrets.GITHUB_TOKEN }}
dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
snyk-org: ${{ secrets.SNYK_ORG }}
snyk-token: '${{ secrets.SNYK_TOKEN }}'

r-session-complete-preview:
needs: [versions]
Expand Down Expand Up @@ -289,6 +299,8 @@ jobs:
ghcr-token: ${{ secrets.GITHUB_TOKEN }}
dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
snyk-org: ${{ secrets.SNYK_ORG }}
snyk-token: '${{ secrets.SNYK_TOKEN }}'

r-session-complete-daily:
needs: [versions]
Expand Down Expand Up @@ -327,6 +339,8 @@ jobs:
ghcr-token: ${{ secrets.GITHUB_TOKEN }}
dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
snyk-org: ${{ secrets.SNYK_ORG }}
snyk-token: '${{ secrets.SNYK_TOKEN }}'

workbench-preview:
needs: [versions]
Expand Down Expand Up @@ -365,6 +379,8 @@ jobs:
ghcr-token: ${{ secrets.GITHUB_TOKEN }}
dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
snyk-org: ${{ secrets.SNYK_ORG }}
snyk-token: '${{ secrets.SNYK_TOKEN }}'

workbench-daily:
needs: [versions]
Expand Down Expand Up @@ -403,3 +419,5 @@ jobs:
ghcr-token: ${{ secrets.GITHUB_TOKEN }}
dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
snyk-org: ${{ secrets.SNYK_ORG }}
snyk-token: '${{ secrets.SNYK_TOKEN }}'
Loading
Loading