Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

repo sync #15337

Merged
merged 2 commits into from
Feb 10, 2022
Merged

repo sync #15337

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19a1963
fix actions logic (#25239)
mikesurowiec Feb 10, 2022
8cfb630
Merge branch 'main' into repo-sync
Octomerger Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/azure-preview-env-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@94ab11c41e45d028884a99163086648e898eed25

- if: ${{ env.IS_PUBLIC_BUILD }}
- if: ${{ env.IS_PUBLIC_BUILD == 'true' }}
name: Check out main branch
uses: actions/checkout@1e204e9a9253d643386038d443f96446fa156a97
with:
ref: 'main'
persist-credentials: 'false'
lfs: 'true'

- if: ${{ env.IS_INTERNAL_BUILD }}
- if: ${{ env.IS_INTERNAL_BUILD == 'true' }}
name: Check out PR code
uses: actions/checkout@1e204e9a9253d643386038d443f96446fa156a97
with:
Expand All @@ -103,7 +103,7 @@ jobs:
# Image tag is unique to each workflow run so that it always triggers a new deployment
echo "DOCKER_IMAGE=${{ secrets.NONPROD_REGISTRY_SERVER }}/${IMAGE_REPO}:${{ env.COMMIT_REF }}-${{ github.run_number }}-${{ github.run_attempt }}" >> $GITHUB_ENV

- if: ${{ env.IS_INTERNAL_BUILD }}
- if: ${{ env.IS_INTERNAL_BUILD == 'true' }}
name: Determine which docs-early-access branch to clone
id: 'check-early-access'
uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
return 'main'
}

- if: ${{ env.IS_INTERNAL_BUILD }}
- if: ${{ env.IS_INTERNAL_BUILD == 'true' }}
name: Clone docs-early-access
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
with:
Expand All @@ -142,19 +142,19 @@ jobs:
path: docs-early-access
ref: ${{ steps.check-early-access.outputs.result }}

- if: ${{ env.IS_INTERNAL_BUILD }}
- if: ${{ env.IS_INTERNAL_BUILD == 'true' }}
name: Merge docs-early-access repo's folders
run: .github/actions-scripts/merge-early-access.sh

- if: ${{ env.IS_PUBLIC_BUILD }}
- if: ${{ env.IS_PUBLIC_BUILD == 'true' }}
name: Check out user code to temp directory
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
with:
path: ./user-code
ref: ${{ env.COMMIT_REF }}

# Move acceptable user changes into our main branch checkout
- if: ${{ env.IS_PUBLIC_BUILD }}
- if: ${{ env.IS_PUBLIC_BUILD == 'true' }}
name: Move acceptable user changes
run: |
rsync -rptovR ./user-code/content/./**/*.md ./content
Expand Down