From adbe2481296c0460464dcc3757d072b7df41dc0f Mon Sep 17 00:00:00 2001 From: Collin Barrett <6483057+collinbarrett@users.noreply.github.com> Date: Mon, 26 May 2025 17:40:45 -0500 Subject: [PATCH] Revert "chore: bump base images" This reverts commit fa75749fb64e96f43ce3be33ed75b6722d0361e7. --- .github/workflows/directory-migrate.yml | 2 +- .github/workflows/directory.yml | 10 +++++++++- .../FilterLists.Directory.Api.csproj | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/directory-migrate.yml b/.github/workflows/directory-migrate.yml index f32ae5ec9..c88f207ae 100644 --- a/.github/workflows/directory-migrate.yml +++ b/.github/workflows/directory-migrate.yml @@ -23,7 +23,7 @@ jobs: USER_EMAIL: github-actions[bot]@users.noreply.github.com LINT_MESSAGE: "chore(dir-data): 🎨 lint PR #${{ github.event.number }}" MIGRATION_MESSAGE: "chore(dir-data): ♻️ migrate PR #${{ github.event.number }}" - TEST_MSSQL_IMAGE: mcr.microsoft.com/mssql/server:2025-latest + TEST_MSSQL_IMAGE: mcr.microsoft.com/mssql/server:2022-latest steps: - name: Checkout diff --git a/.github/workflows/directory.yml b/.github/workflows/directory.yml index ed8371962..6e6cb12c1 100644 --- a/.github/workflows/directory.yml +++ b/.github/workflows/directory.yml @@ -42,6 +42,14 @@ jobs: with: dotnet-version: "9.0.x" + # Disabled GH Actions cache for Dependabot. https://github.com/dependabot/dependabot-core/issues/1303 + # cache-dependency-path: services/Directory/FilterLists.Directory.Api/packages.lock.json + # cache: true + + # - name: Restore + # run: dotnet restore --locked-mode + # working-directory: ./services/Directory/FilterLists.Directory.Api + - name: Build run: dotnet build -c Release working-directory: ./services/Directory/FilterLists.Directory.Api @@ -86,4 +94,4 @@ jobs: with: app-name: ${{ env.AZURE_WEBAPP_NAME }} publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE_APP_FILTERLISTS_DIRECTORY_PROD }} - images: ${{ env.CONTAINER_REGISTRY }}/${{ env.CONTAINER_REPOSITORY }}:${{ env.CONTAINER_IMAGE_TAG_UNIQUE }} \ No newline at end of file + images: ${{ env.CONTAINER_REGISTRY }}/${{ env.CONTAINER_REPOSITORY }}:${{ env.CONTAINER_IMAGE_TAG_UNIQUE }} diff --git a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj index f4712e98f..590b29148 100644 --- a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj +++ b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj @@ -7,7 +7,7 @@ true true - mcr.microsoft.com/dotnet/runtime-deps:9.0-azurelinux3.0-distroless + mcr.microsoft.com/dotnet/runtime-deps:8.0-jammy-chiseled-extra linux-x64