diff --git a/.gitea/workflows/build-test-deploy.yml b/.gitea/workflows/build-test-deploy.yml index e22196489..14c2218df 100644 --- a/.gitea/workflows/build-test-deploy.yml +++ b/.gitea/workflows/build-test-deploy.yml @@ -93,12 +93,12 @@ jobs: - name: Ensure binary manifests are up to date run: | python3 scripts/update-binary-manifests.py - git diff --exit-code local-nugets/manifest.json vendor/manifest.json offline/feeds/manifest.json + git diff --exit-code .nuget/manifest.json vendor/manifest.json offline/feeds/manifest.json - - name: Ensure Mongo test URI configured + - name: Ensure PostgreSQL test URI configured run: | - if [ -z "${STELLAOPS_TEST_MONGO_URI:-}" ]; then - echo "::error::STELLAOPS_TEST_MONGO_URI must be provided via repository secrets or variables for Graph Indexer integration tests." + if [ -z "${STELLAOPS_TEST_POSTGRES_CONNECTION:-}" ]; then + echo "::error::STELLAOPS_TEST_POSTGRES_CONNECTION must be provided via repository secrets or variables for integration tests." exit 1 fi diff --git a/.gitea/workflows/connector-fixture-drift.yml b/.gitea/workflows/connector-fixture-drift.yml index 76894259b..197da1c63 100644 --- a/.gitea/workflows/connector-fixture-drift.yml +++ b/.gitea/workflows/connector-fixture-drift.yml @@ -56,8 +56,7 @@ jobs: uses: actions/cache@v4 with: path: | - ~/.nuget/packages - local-nugets/packages + .nuget/packages key: fixture-drift-nuget-${{ runner.os }}-${{ hashFiles('**/*.csproj') }} - name: Restore solution diff --git a/.gitea/workflows/policy-lint.yml b/.gitea/workflows/policy-lint.yml index a23e497f6..0f357967c 100644 --- a/.gitea/workflows/policy-lint.yml +++ b/.gitea/workflows/policy-lint.yml @@ -43,7 +43,7 @@ jobs: with: path: | ~/.nuget/packages - local-nugets/packages + .nuget/packages key: policy-lint-nuget-${{ runner.os }}-${{ hashFiles('**/*.csproj') }} - name: Restore CLI diff --git a/.gitea/workflows/policy-simulate.yml b/.gitea/workflows/policy-simulate.yml index cd2d2e7b5..1679364aa 100644 --- a/.gitea/workflows/policy-simulate.yml +++ b/.gitea/workflows/policy-simulate.yml @@ -47,7 +47,7 @@ jobs: with: path: | ~/.nuget/packages - local-nugets/packages + .nuget/packages key: policy-sim-nuget-${{ runner.os }}-${{ hashFiles('**/*.csproj') }} - name: Restore CLI diff --git a/.gitea/workflows/sdk-publish.yml b/.gitea/workflows/sdk-publish.yml index 8fecdb7d6..bf8b31a6e 100644 --- a/.gitea/workflows/sdk-publish.yml +++ b/.gitea/workflows/sdk-publish.yml @@ -23,7 +23,7 @@ jobs: DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: 1 TZ: UTC - SDK_NUGET_SOURCE: ${{ secrets.SDK_NUGET_SOURCE || 'local-nugets/packages' }} + SDK_NUGET_SOURCE: ${{ secrets.SDK_NUGET_SOURCE || '.nuget/packages' }} SDK_NUGET_API_KEY: ${{ secrets.SDK_NUGET_API_KEY }} SDK_SIGNING_CERT_B64: ${{ secrets.SDK_SIGNING_CERT_B64 }} SDK_SIGNING_CERT_PASSWORD: ${{ secrets.SDK_SIGNING_CERT_PASSWORD }} @@ -46,8 +46,7 @@ jobs: uses: actions/cache@v4 with: path: | - ~/.nuget/packages - local-nugets/packages + .nuget/packages key: sdk-nuget-${{ runner.os }}-${{ hashFiles('src/Sdk/**/*.csproj') }} - name: Restore (best effort; skipped if no csproj) @@ -87,6 +86,6 @@ jobs: name: sdk-artifacts path: | out/sdk - local-nugets/packages/*.nupkg + .nuget/packages/*.nupkg if-no-files-found: warn retention-days: 7 diff --git a/.gitea/workflows/signals-ci.yml b/.gitea/workflows/signals-ci.yml index f7c735a61..cdbbeef02 100644 --- a/.gitea/workflows/signals-ci.yml +++ b/.gitea/workflows/signals-ci.yml @@ -45,7 +45,7 @@ jobs: with: path: | ~/.nuget/packages - local-nugets/packages + .nuget/packages key: signals-nuget-${{ runner.os }}-${{ hashFiles('src/Signals/**/*.csproj') }} - name: Restore diff --git a/.gitea/workflows/unknowns-budget-gate.yml b/.gitea/workflows/unknowns-budget-gate.yml index ff1e5affd..cb09f1033 100644 --- a/.gitea/workflows/unknowns-budget-gate.yml +++ b/.gitea/workflows/unknowns-budget-gate.yml @@ -50,7 +50,7 @@ jobs: with: path: | ~/.nuget/packages - local-nugets/packages + .nuget/packages key: budget-gate-nuget-${{ runner.os }}-${{ hashFiles('**/*.csproj') }} - name: Restore and Build CLI diff --git a/.gitignore b/.gitignore index 4fb60c9ee..15c50d094 100644 --- a/.gitignore +++ b/.gitignore @@ -17,8 +17,7 @@ obj/ # Packages and logs *.log TestResults/ -local-nuget/ -local-nugets/packages/ +.nuget/packages/ .dotnet .DS_Store @@ -60,10 +59,8 @@ obj/ logs/ tmp/ coverage/ +# Consolidated NuGet cache (all variants) .nuget/ -local-nugets/ -local-nuget/ -src/Sdk/StellaOps.Sdk.Generator/tools/jdk-21.0.1+12 -.nuget-cache/ -.nuget-packages2/ -.nuget-temp/ \ No newline at end of file +.nuget-*/ +local-nuget*/ +src/Sdk/StellaOps.Sdk.Generator/tools/jdk-21.0.1+12 \ No newline at end of file diff --git a/NuGet.config b/NuGet.config index fe882c2df..fef36fe49 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,5 +1,9 @@ + + + + diff --git a/tools/linksets-ci.sh b/tools/linksets-ci.sh index bde35997e..fbfa4c417 100644 --- a/tools/linksets-ci.sh +++ b/tools/linksets-ci.sh @@ -10,8 +10,8 @@ export VSTEST_DISABLE_APPDOMAIN=1 export DOTNET_CLI_UI_LANGUAGE=en export DOTNET_CLI_TELEMETRY_OPTOUT=1 # Prefer the curated offline feed to avoid network flakiness during CI. -export NUGET_PACKAGES="${ROOT_DIR}/local-nugets" -RESTORE_SOURCE="--source ${ROOT_DIR}/local-nugets --ignore-failed-sources" +export NUGET_PACKAGES="${ROOT_DIR}/.nuget/packages" +RESTORE_SOURCE="--source ${ROOT_DIR}/.nuget/packages --ignore-failed-sources" # Ensure Mongo2Go can find OpenSSL 1.1 (needed by bundled mongod) OPENSSL11_DIR="$ROOT_DIR/tools/openssl1.1/lib" if [[ -d "$OPENSSL11_DIR" ]]; then diff --git a/tools/offline/fetch-sbomservice-deps.sh b/tools/offline/fetch-sbomservice-deps.sh index 46e0aa9c4..10413c2d0 100644 --- a/tools/offline/fetch-sbomservice-deps.sh +++ b/tools/offline/fetch-sbomservice-deps.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail ROOT="$(cd "$(dirname "$0")/../.." && pwd)" -PACKAGES_DIR="$ROOT/local-nugets/packages" +PACKAGES_DIR="$ROOT/.nuget/packages" TMP_DIR="$ROOT/tmp/sbomservice-feed" PROJECT="$TMP_DIR/probe.csproj"