diff --git a/.github/workflows/_build.yaml b/.github/workflows/_build.yaml index c15af581..6e3b406d 100644 --- a/.github/workflows/_build.yaml +++ b/.github/workflows/_build.yaml @@ -7,6 +7,11 @@ on: type: string default: main required: false + client_checkout_target_name: + description: "Switch branches or restore working tree files to build vald" + type: string + default: main + required: false enable_tag_push: description: "Whether or not to push tag" type: boolean @@ -26,6 +31,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 + ref: ${{ inputs.client_checkout_target_name }} - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml index eb8b09ba..eee0001d 100644 --- a/.github/workflows/sync.yaml +++ b/.github/workflows/sync.yaml @@ -23,7 +23,8 @@ jobs: uses: ./.github/workflows/_build.yaml secrets: inherit with: - vald_checkout_target_name: main # sync based on vald main branch. + vald_checkout_target_name: main # sync based on vald main branch. + client_checkout_target_name: main enable_tag_push: true semver-auto: @@ -41,12 +42,13 @@ jobs: IMAGE_TAG: ${{ needs.semver-auto.outputs.VERSION }} secrets: inherit - build: - needs: - - semver-auto - - prepare - uses: ./.github/workflows/_build.yaml - secrets: inherit - with: - vald_checkout_target_name: ${{ needs.semver-auto.outputs.VERSION }} # sync based on vald released version. - enable_tag_push: true + # build: + # needs: + # - semver-auto + # - prepare + # uses: ./.github/workflows/_build.yaml + # secrets: inherit + # with: + # vald_checkout_target_name: ${{ needs.semver-auto.outputs.VERSION }} # sync based on vald released version. + # client_checkout_target_name: ${{ needs.semver-auto.outputs.RELEASE_BRANCH_NAME }} + # enable_tag_push: true