From c8690caf6ebb6337ce057cf7a61a1a8f53d61118 Mon Sep 17 00:00:00 2001 From: Skye Turriff Date: Tue, 29 Oct 2024 15:26:46 -0400 Subject: [PATCH] add workbench-session-init target to manual and preview workflows to enable build/publish of daily --- .github/workflows/build-bake-preview.yaml | 40 +++++++++++++++++++++++ .github/workflows/build-manual.yaml | 1 + .github/workflows/lint.yaml | 1 + .github/workflows/update-readme.yaml | 1 + docker-bake.preview.hcl | 1 + tools/dockerhub_clean.py | 1 + 6 files changed, 45 insertions(+) diff --git a/.github/workflows/build-bake-preview.yaml b/.github/workflows/build-bake-preview.yaml index 641787f5b..5912e781e 100644 --- a/.github/workflows/build-bake-preview.yaml +++ b/.github/workflows/build-bake-preview.yaml @@ -421,3 +421,43 @@ jobs: dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} snyk-org: ${{ secrets.SNYK_ORG }} snyk-token: '${{ secrets.SNYK_TOKEN }}' + + workbench-session-init-daily: + needs: [versions] + name: Workbench Session Init - Daily + runs-on: ubuntu-latest-4x + + env: + target: "workbench-session-init-daily" + WORKBENCH_DAILY_VERSION: ${{ needs.versions.outputs.WORKBENCH_DAILY_VERSION }} + WORKBENCH_PREVIEW_VERSION: ${{ needs.versions.outputs.WORKBENCH_PREVIEW_VERSION }} + PACKAGE_MANAGER_DAILY_VERSION: ${{ needs.versions.outputs.PACKAGE_MANAGER_DAILY_VERSION }} + PACKAGE_MANAGER_PREVIEW_VERSION: ${{ needs.versions.outputs.PACKAGE_MANAGER_PREVIEW_VERSION }} + CONNECT_DAILY_VERSION: ${{ needs.versions.outputs.CONNECT_DAILY_VERSION }} + BRANCH: ${{ github.head_ref || github.ref_name }} + + concurrency: + group: bake-workbench-session-init-daily-${{ github.ref }} + cancel-in-progress: true + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + id: setup-buildx + with: + buildkitd-config: ./share/buildkitd.toml + + - name: Build, Test, and Push + uses: ./.github/actions/bake-test-push + with: + target: ${{ env.target }} + bakefile: docker-bake.preview.hcl + push-image: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/dev-rspm' }} + 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 }}' diff --git a/.github/workflows/build-manual.yaml b/.github/workflows/build-manual.yaml index e9ceb46b5..a2dbda9ad 100644 --- a/.github/workflows/build-manual.yaml +++ b/.github/workflows/build-manual.yaml @@ -21,6 +21,7 @@ on: - workbench - workbench-for-google-cloud-workstations - workbench-for-microsoft-azure-ml + - workbench-session-init type: description: "The type of image being built." required: false diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 8503bb735..55c018330 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -25,6 +25,7 @@ jobs: - {product: 'connect-content-init', os: 'ubuntu2204'} - {product: 'package-manager', os: 'ubuntu2204'} - {product: 'r-session-complete', os: 'ubuntu2204'} + - {product: 'workbench-session-init', os: 'ubuntu2204'} - {product: 'workbench-for-microsoft-azure-ml', os: 'ubuntu2204'} - {product: 'content/base', os: 'ubuntu1804'} - {product: 'content/base', os: 'ubuntu2204'} diff --git a/.github/workflows/update-readme.yaml b/.github/workflows/update-readme.yaml index 78a9db227..e417261b4 100644 --- a/.github/workflows/update-readme.yaml +++ b/.github/workflows/update-readme.yaml @@ -24,6 +24,7 @@ jobs: - {prefix: '', repository: 'content-pro', readme_path: './content/pro/README.md'} - {prefix: 'rstudio-', repository: 'package-manager', readme_path: './package-manager/README.md'} - {prefix: '', repository: 'r-session-complete', readme_path: './r-session-complete/README.md'} + - {prefix: '', repository: 'workbench-session-init', readme_path: './workbench-session-init/README.md'} steps: - name: Check Out Repo diff --git a/docker-bake.preview.hcl b/docker-bake.preview.hcl index 9b6c3c5aa..b81c79862 100644 --- a/docker-bake.preview.hcl +++ b/docker-bake.preview.hcl @@ -183,6 +183,7 @@ group "default" { "r-session-complete-daily", "workbench-preview", "workbench-daily", + "workbench-session-init-daily", ] } diff --git a/tools/dockerhub_clean.py b/tools/dockerhub_clean.py index 0bace396b..5cb1c592f 100755 --- a/tools/dockerhub_clean.py +++ b/tools/dockerhub_clean.py @@ -23,6 +23,7 @@ "rstudio-workbench", "rstudio-workbench-for-microsoft-azure-ml", "rstudio-workbench-preview", + "workbench-session-init-preview", ]