Revert "Disable Azure ML image build for now"

This reverts commit ea37e1d.
rstudio · Oct 28, 2024 · 8030892 · 8030892
1 parent cd968fa
commit 8030892
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 4 deletions.
diff --git a/.github/workflows/build-bake.yaml b/.github/workflows/build-bake.yaml
@@ -6,7 +6,7 @@ on:
       - main
       - dev
   pull_request:
-
+  
 name: Release - Build, Test, and Push
 jobs:
   setup:
@@ -374,3 +374,44 @@ jobs:
           snyk-org: ${{ secrets.SNYK_ORG }}
           snyk-token: '${{ secrets.SNYK_TOKEN }}'
 
+  workbench-for-microsoft-azure-ml:
+    needs: [setup]
+    name: Workbench for Microsoft Azure ML
+    runs-on: ubuntu-latest-8x
+
+    concurrency:
+      group: bake-waml-${{ github.ref }}
+      cancel-in-progress: true
+
+    env:
+      target: workbench-for-microsoft-azure-ml
+      GIT_SHA: ${{ needs.setup.outputs.GIT_SHA }}
+
+    steps:
+      - name: Checkout
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Checkout
+        if: github.event_name != 'schedule'
+        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 }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}
+          ghcr-token: ${{ secrets.GITHUB_TOKEN }}
+          dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+          gcp-json: '${{ secrets.GCP_ARTIFACT_REGISTRY_JSON }}'
+          snyk-org: ${{ secrets.SNYK_ORG }}
+          snyk-token: '${{ secrets.SNYK_TOKEN }}'
diff --git a/.github/workflows/build-manual.yaml b/.github/workflows/build-manual.yaml
@@ -126,15 +126,15 @@ jobs:
           else
             VERSION="${{ inputs.version }}"
           fi
-
+          
           # Set the appropriate env var
           suffix="_VERSION"
           if [[ "${{ inputs.type }}" == "preview" ]]; then
             suffix="_PREVIEW_VERSION"
           elif [[ "${{ inputs.type }}" == "daily" ]]; then
             suffix="_DAILY_VERSION"
           fi
-
+          
           product="${{ inputs.product }}"
           if [[ "$product" == "connect" ]] || [[ "$product" == "connect-content-init" ]] || [[ "$product" == "content-images" ]]; then
             product="CONNECT"
@@ -143,7 +143,7 @@ jobs:
           else
             product="WORKBENCH"
           fi
-
+          
           echo "Setting $product$suffix=$VERSION"
           echo "$product$suffix=$VERSION" >> $GITHUB_ENV
 

diff --git 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: 'rstudio-', repository: 'workbench-for-microsoft-azure-ml', readme_path: './workbench-for-microsoft-azure-ml/README.md'}
 
     steps:
       - name: Check Out Repo