diff --git a/.github/workflows/on-push-main.yml b/.github/workflows/on-push-main.yml index 0a8d47f1ec..6df35fef9d 100644 --- a/.github/workflows/on-push-main.yml +++ b/.github/workflows/on-push-main.yml @@ -61,10 +61,3 @@ jobs: PUBLISH_TENANT_ID: ${{ secrets.PUBLISH_TENANT_ID }} PUBLISH_SUBSCRIPTION_ID: ${{ secrets.PUBLISH_SUBSCRIPTION_ID }} PUBLISH_REGISTRY_SERVER: ${{ secrets.PUBLISH_REGISTRY_SERVER }} - - upload-modules-metadata: - uses: ./.github/workflows/upload-modules-metadata.yml - secrets: - CLIENT_ID: ${{ secrets.PUBLISH_CLIENT_ID }} - TENANT_ID: ${{ secrets.PUBLISH_TENANT_ID }} - SUBSCRIPTION_ID: ${{ secrets.PUBLISH_SUBSCRIPTION_ID }} diff --git a/.github/workflows/upload-modules-metadata.yml b/.github/workflows/upload-modules-metadata.yml index 260306230a..eeed26cbb2 100644 --- a/.github/workflows/upload-modules-metadata.yml +++ b/.github/workflows/upload-modules-metadata.yml @@ -1,14 +1,5 @@ name: Upload modules metadata on: - workflow_call: - secrets: - # Secrets must be passed from the caller workflow explicitly. - CLIENT_ID: - required: true - TENANT_ID: - required: true - SUBSCRIPTION_ID: - required: true workflow_dispatch: permissions: @@ -42,9 +33,9 @@ jobs: - name: Log in to Azure uses: azure/login@v1 with: - client-id: ${{ secrets.CLIENT_ID }} - tenant-id: ${{ secrets.TENANT_ID }} - subscription-id: ${{ secrets.SUBSCRIPTION_ID }} + client-id: ${{ secrets.PUBLISH_CLIENT_ID }} + tenant-id: ${{ secrets.PUBLISH_TENANT_ID }} + subscription-id: ${{ secrets.PUBLISH_SUBSCRIPTION_ID }} - name: Upload to blob storage uses: azure/CLI@v1 diff --git a/scripts/github-actions/refresh-module-table.js b/scripts/github-actions/refresh-module-table.js index a1bc889ed4..19990c8bf4 100644 --- a/scripts/github-actions/refresh-module-table.js +++ b/scripts/github-actions/refresh-module-table.js @@ -32,6 +32,7 @@ async function generateModulesTable(require, axios, fs, path, core) { try { core.info(`Getting ${modulePath}...`); + const versionListResponse = await axios.get(versionListUrl); const latestVersion = versionListResponse.data.tags.sort().at(-1); const badgeUrl = `https://img.shields.io/badge/mcr-${latestVersion}-blue`; diff --git a/scripts/github-actions/upload-modules-metadata.js b/scripts/github-actions/upload-modules-metadata.js index 66b83fa42b..908b32ef6c 100644 --- a/scripts/github-actions/upload-modules-metadata.js +++ b/scripts/github-actions/upload-modules-metadata.js @@ -26,7 +26,7 @@ async function uploadModulesMetadata({ require, core }) { try { core.info(`Getting ${modulePath}...`); - const versionListResponse = await axios.default.get(versionListUrl); + const versionListResponse = await axios.get(versionListUrl); const tags = versionListResponse.data.tags.sort(); result.push({