From 1a356fe4fa796bba54a7064466f6a92d0a9d44ab Mon Sep 17 00:00:00 2001 From: melissag-ensemble Date: Mon, 27 Apr 2026 09:49:55 -0700 Subject: [PATCH 1/3] chore: copy v1 workflows to v2 --- ....yml => build-auto-generated-files-v2.yml} | 0 .github/workflows/deploy-private-v2.yml | 39 +++++++++++++++++++ .../workflows/{deploy.yml => deploy-v2.yml} | 0 .github/workflows/stage-private-v2.yml | 28 +++++++++++++ .github/workflows/{stage.yml => stage-v2.yml} | 0 5 files changed, 67 insertions(+) rename .github/workflows/{build-auto-generated-files.yml => build-auto-generated-files-v2.yml} (100%) create mode 100644 .github/workflows/deploy-private-v2.yml rename .github/workflows/{deploy.yml => deploy-v2.yml} (100%) create mode 100644 .github/workflows/stage-private-v2.yml rename .github/workflows/{stage.yml => stage-v2.yml} (100%) diff --git a/.github/workflows/build-auto-generated-files.yml b/.github/workflows/build-auto-generated-files-v2.yml similarity index 100% rename from .github/workflows/build-auto-generated-files.yml rename to .github/workflows/build-auto-generated-files-v2.yml diff --git a/.github/workflows/deploy-private-v2.yml b/.github/workflows/deploy-private-v2.yml new file mode 100644 index 0000000..0d4eae6 --- /dev/null +++ b/.github/workflows/deploy-private-v2.yml @@ -0,0 +1,39 @@ +--- +name: Production Deployment +on: + push: + branches: + - main + workflow_dispatch: + inputs: + env: + description: "Select environment to deploy to" + type: choice + required: true + default: "prod" + options: + - "prod" + - "stage & prod" + baseSha: + description: "Use base SHA commit to deploy from (empty string defaults to last commit before HEAD)" + type: string + required: false + default: "" + deployAll: + description: "Force deploy all files" + type: boolean + default: false +jobs: + deployment: + name: Deployment + uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy.yml@main + secrets: + AIO_AZURE_DEV_PRIVATE_CONNECTION_STRING: ${{ secrets.AIO_AZURE_DEV_PRIVATE_CONNECTION_STRING }} + AIO_AZURE_PROD_PRIVATE_CONNECTION_STRING: ${{ secrets.AIO_AZURE_PROD_PRIVATE_CONNECTION_STRING }} + AIO_FASTLY_TOKEN: ${{ secrets.AIO_FASTLY_TOKEN }} + AIO_FASTLY_PROD_URL: ${{ secrets.AIO_FASTLY_PROD_URL }} + AIO_FASTLY_DEV_URL: ${{ secrets.AIO_FASTLY_DEV_URL }} + with: + env: ${{ inputs.env || 'prod' }} + baseSha: ${{ inputs.baseSha || '' }} + deployAll: ${{ inputs.deployAll || false }} \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy-v2.yml similarity index 100% rename from .github/workflows/deploy.yml rename to .github/workflows/deploy-v2.yml diff --git a/.github/workflows/stage-private-v2.yml b/.github/workflows/stage-private-v2.yml new file mode 100644 index 0000000..0fc707c --- /dev/null +++ b/.github/workflows/stage-private-v2.yml @@ -0,0 +1,28 @@ +--- +name: Staging +on: + workflow_dispatch: + inputs: + baseSha: + description: "Use base SHA commit to deploy from (empty string defaults to last commit before HEAD)" + type: string + required: false + default: "" + deployAll: + description: "Force deploy all files" + type: boolean + default: false +jobs: + deployment: + name: Deployment + uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy.yml@main + secrets: + AIO_AZURE_DEV_PRIVATE_CONNECTION_STRING: ${{ secrets.AIO_AZURE_DEV_PRIVATE_CONNECTION_STRING }} + AIO_AZURE_PROD_PRIVATE_CONNECTION_STRING: ${{ secrets.AIO_AZURE_PROD_PRIVATE_CONNECTION_STRING }} + AIO_FASTLY_TOKEN: ${{ secrets.AIO_FASTLY_TOKEN }} + AIO_FASTLY_PROD_URL: ${{ secrets.AIO_FASTLY_PROD_URL }} + AIO_FASTLY_DEV_URL: ${{ secrets.AIO_FASTLY_DEV_URL }} + with: + env: stage + baseSha: ${{ inputs.baseSha }} + deployAll: ${{ inputs.deployAll }} \ No newline at end of file diff --git a/.github/workflows/stage.yml b/.github/workflows/stage-v2.yml similarity index 100% rename from .github/workflows/stage.yml rename to .github/workflows/stage-v2.yml From 64f4bd0db8064340d40b392fa7f648660b7b9cc3 Mon Sep 17 00:00:00 2001 From: melissag-ensemble Date: Fri, 1 May 2026 09:11:25 -0700 Subject: [PATCH 2/3] feat: v2 workflows --- .../build-auto-generated-files-private-v2.yml | 13 ++++++++ .../build-auto-generated-files-v2.yml | 4 +-- .github/workflows/deploy-private-v2.yml | 33 +++---------------- .github/workflows/deploy-v2.yml | 4 ++- .github/workflows/stage-private-v2.yml | 24 +++----------- .github/workflows/stage-v2.yml | 3 +- package.json | 2 +- 7 files changed, 29 insertions(+), 54 deletions(-) create mode 100644 .github/workflows/build-auto-generated-files-private-v2.yml diff --git a/.github/workflows/build-auto-generated-files-private-v2.yml b/.github/workflows/build-auto-generated-files-private-v2.yml new file mode 100644 index 0000000..847c547 --- /dev/null +++ b/.github/workflows/build-auto-generated-files-private-v2.yml @@ -0,0 +1,13 @@ +--- +name: Build Auto-Generated Files +on: + workflow_dispatch: + +jobs: + build-contributors: + name: Build Auto-Generated Files + uses: AdobeDocs/adp-devsite-workflow/.github/workflows/build-auto-generated-files-v2.yml@main + secrets: + ADP_DEVSITE_APP_ID: ${{ secrets.ADP_DEVSITE_APP_ID }} + ADP_DEVSITE_APP_PRIVATE_KEY: ${{ secrets.ADP_DEVSITE_APP_PRIVATE_KEY }} + \ No newline at end of file diff --git a/.github/workflows/build-auto-generated-files-v2.yml b/.github/workflows/build-auto-generated-files-v2.yml index c926d91..3ee6368 100644 --- a/.github/workflows/build-auto-generated-files-v2.yml +++ b/.github/workflows/build-auto-generated-files-v2.yml @@ -1,13 +1,11 @@ --- name: Build Auto-Generated Files on: - pull_request: workflow_dispatch: jobs: build-contributors: name: Build Auto-Generated Files - if: github.repository != 'AdobeDocs/dev-docs-template' - uses: AdobeDocs/adp-devsite-workflow/.github/workflows/build-auto-generated-files.yml@main + uses: AdobeDocs/adp-devsite-workflow/.github/workflows/build-auto-generated-files-v2.yml@main secrets: inherit \ No newline at end of file diff --git a/.github/workflows/deploy-private-v2.yml b/.github/workflows/deploy-private-v2.yml index 0d4eae6..f45d8a2 100644 --- a/.github/workflows/deploy-private-v2.yml +++ b/.github/workflows/deploy-private-v2.yml @@ -5,35 +5,12 @@ on: branches: - main workflow_dispatch: - inputs: - env: - description: "Select environment to deploy to" - type: choice - required: true - default: "prod" - options: - - "prod" - - "stage & prod" - baseSha: - description: "Use base SHA commit to deploy from (empty string defaults to last commit before HEAD)" - type: string - required: false - default: "" - deployAll: - description: "Force deploy all files" - type: boolean - default: false + jobs: deployment: name: Deployment - uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy.yml@main - secrets: - AIO_AZURE_DEV_PRIVATE_CONNECTION_STRING: ${{ secrets.AIO_AZURE_DEV_PRIVATE_CONNECTION_STRING }} - AIO_AZURE_PROD_PRIVATE_CONNECTION_STRING: ${{ secrets.AIO_AZURE_PROD_PRIVATE_CONNECTION_STRING }} - AIO_FASTLY_TOKEN: ${{ secrets.AIO_FASTLY_TOKEN }} - AIO_FASTLY_PROD_URL: ${{ secrets.AIO_FASTLY_PROD_URL }} - AIO_FASTLY_DEV_URL: ${{ secrets.AIO_FASTLY_DEV_URL }} + if: github.actor != 'adp-devsite-app[bot]' && github.repository != 'AdobeDocs/dev-docs-template' + uses: AdobeDocsPrivate/adp-devsite-workflow-private/.github/workflows/deploy-v2.yml@main + secrets: inherit with: - env: ${{ inputs.env || 'prod' }} - baseSha: ${{ inputs.baseSha || '' }} - deployAll: ${{ inputs.deployAll || false }} \ No newline at end of file + env: prod \ No newline at end of file diff --git a/.github/workflows/deploy-v2.yml b/.github/workflows/deploy-v2.yml index 5891b43..8181bc6 100644 --- a/.github/workflows/deploy-v2.yml +++ b/.github/workflows/deploy-v2.yml @@ -26,7 +26,9 @@ on: jobs: deployment: name: Deployment - uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy.yml@main + if: github.actor != 'adp-devsite-app[bot]' && github.repository != 'AdobeDocs/dev-docs-template' + uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy-v2.yml@main + secrets: inherit with: env: ${{ inputs.env || 'prod' }} baseSha: ${{ inputs.baseSha || '' }} diff --git a/.github/workflows/stage-private-v2.yml b/.github/workflows/stage-private-v2.yml index 0fc707c..3dbc813 100644 --- a/.github/workflows/stage-private-v2.yml +++ b/.github/workflows/stage-private-v2.yml @@ -2,27 +2,11 @@ name: Staging on: workflow_dispatch: - inputs: - baseSha: - description: "Use base SHA commit to deploy from (empty string defaults to last commit before HEAD)" - type: string - required: false - default: "" - deployAll: - description: "Force deploy all files" - type: boolean - default: false + jobs: deployment: name: Deployment - uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy.yml@main - secrets: - AIO_AZURE_DEV_PRIVATE_CONNECTION_STRING: ${{ secrets.AIO_AZURE_DEV_PRIVATE_CONNECTION_STRING }} - AIO_AZURE_PROD_PRIVATE_CONNECTION_STRING: ${{ secrets.AIO_AZURE_PROD_PRIVATE_CONNECTION_STRING }} - AIO_FASTLY_TOKEN: ${{ secrets.AIO_FASTLY_TOKEN }} - AIO_FASTLY_PROD_URL: ${{ secrets.AIO_FASTLY_PROD_URL }} - AIO_FASTLY_DEV_URL: ${{ secrets.AIO_FASTLY_DEV_URL }} + uses: AdobeDocsPrivate/adp-devsite-workflow-private/.github/workflows/deploy-v2.yml@main + secrets: inherit with: - env: stage - baseSha: ${{ inputs.baseSha }} - deployAll: ${{ inputs.deployAll }} \ No newline at end of file + env: stg \ No newline at end of file diff --git a/.github/workflows/stage-v2.yml b/.github/workflows/stage-v2.yml index c96a42d..d108f50 100644 --- a/.github/workflows/stage-v2.yml +++ b/.github/workflows/stage-v2.yml @@ -15,7 +15,8 @@ on: jobs: deployment: name: Deployment - uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy.yml@main + uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy-v2.yml@main + secrets: inherit with: env: stage baseSha: ${{ inputs.baseSha }} diff --git a/package.json b/package.json index eb7450e..ca0b5ff 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "normalizeLinks": "npx --yes github:AdobeDocs/adp-devsite-utils normalizeLinks -v", "buildSiteWideBanner": "npx --yes github:AdobeDocs/adp-devsite-utils buildSiteWideBanner -v", "buildSiteMetadata": "npx --yes github:AdobeDocs/adp-devsite-utils buildSiteMetadata -v", - "buildContributors": "npx --yes github:AdobeDocs/adp-devsite-utils buildContributors -v", + "buildContributors": "npx --yes github:AdobeDocs/adp-devsite-utils buildContributorsV2 -v", "lint": "npx --yes github:AdobeDocs/adp-devsite-utils runLint -v", "lint:errorOnly": "npx --yes github:AdobeDocs/adp-devsite-utils runLint", "link:externalLinkOnly": "npx --yes github:AdobeDocs/adp-devsite-utils runLint --external-links-only -v", From 21d83a35dae0d5b9360de6dbd8d1ed5de89d7908 Mon Sep 17 00:00:00 2001 From: melissag-ensemble Date: Thu, 7 May 2026 14:22:58 -0700 Subject: [PATCH 3/3] refactor: keep caller workflow filenames unchanged --- ...auto-generated-files-v2.yml => build-auto-generated-files.yml} | 0 .github/workflows/{deploy-v2.yml => deploy.yml} | 0 .github/workflows/{stage-v2.yml => stage.yml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{build-auto-generated-files-v2.yml => build-auto-generated-files.yml} (100%) rename .github/workflows/{deploy-v2.yml => deploy.yml} (100%) rename .github/workflows/{stage-v2.yml => stage.yml} (100%) diff --git a/.github/workflows/build-auto-generated-files-v2.yml b/.github/workflows/build-auto-generated-files.yml similarity index 100% rename from .github/workflows/build-auto-generated-files-v2.yml rename to .github/workflows/build-auto-generated-files.yml diff --git a/.github/workflows/deploy-v2.yml b/.github/workflows/deploy.yml similarity index 100% rename from .github/workflows/deploy-v2.yml rename to .github/workflows/deploy.yml diff --git a/.github/workflows/stage-v2.yml b/.github/workflows/stage.yml similarity index 100% rename from .github/workflows/stage-v2.yml rename to .github/workflows/stage.yml