From 19493d860465bd34293896af14e7ddfa6471f3c5 Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Fri, 25 Oct 2024 15:27:49 -0500 Subject: [PATCH] Disable Azure ML image build for now The builds for Azure ML continue to fail due to python package incompatibilities introduced upstream. Add this to the issues to resolve in: - https://github.com/rstudio/rstudio-docker-products/issues/562 --- .github/workflows/build-bake.yaml | 43 +---------------------------- .github/workflows/build-manual.yaml | 6 ++-- 2 files changed, 4 insertions(+), 45 deletions(-) diff --git a/.github/workflows/build-bake.yaml b/.github/workflows/build-bake.yaml index c1c67e11a..be7b55e77 100644 --- 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,44 +374,3 @@ 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 index 2f9917747..e9ceb46b5 100644 --- a/.github/workflows/build-manual.yaml +++ b/.github/workflows/build-manual.yaml @@ -126,7 +126,7 @@ jobs: else VERSION="${{ inputs.version }}" fi - + # Set the appropriate env var suffix="_VERSION" if [[ "${{ inputs.type }}" == "preview" ]]; then @@ -134,7 +134,7 @@ jobs: 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