resolving merge conflicts #11
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <<<<<<< HEAD | ||
| ======= | ||
| ## ----------------------------------------------------------------------------- | ||
| # Copyright (c) Microsoft Corporation. All rights reserved. | ||
| # Licensed under the MIT License. See LICENSE.txt in the project root for license information. | ||
| ## ----------------------------------------------------------------------------- | ||
| # | ||
| # Summary: | ||
| # This GitHub Actions workflow automates the release process using Release Please. | ||
| # It triggers on pushes to the main branch, generates a GitHub App token using organization | ||
| # variables and secrets, and then runs the release-please-action to manage versioning and changelogs. | ||
| >>>>>>> dev | ||
| name: Release Please for Master | ||
| on: | ||
| push: | ||
| branches: | ||
| - dev # Trigger when dev is updated | ||
| workflow_dispatch: # Allow manual triggering from GitHub UI | ||
| inputs: | ||
| reason: | ||
| description: 'Reason for manual trigger' | ||
| required: false | ||
| default: 'Manual release trigger' | ||
| dry_run: | ||
| description: 'Perform dry run (no actual release)' | ||
| required: false | ||
| type: boolean | ||
| default: false | ||
| jobs: | ||
| release-please-master: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Log manual trigger details | ||
| if: github.event_name == 'workflow_dispatch' | ||
| run: | | ||
| echo "Manual trigger initiated" | ||
| echo "Reason: ${{ github.event.inputs.reason }}" | ||
| echo "Dry run: ${{ github.event.inputs.dry_run }}" | ||
| echo "Triggered by: ${{ github.actor }}" | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
| - name: Generate GitHub App token | ||
| id: app-token | ||
| uses: actions/create-github-app-token@v2 | ||
| with: | ||
| app-id: ${{ vars.RELEASE_PLEASE_TOKEN_PROVIDER_APP_ID }} | ||
| private-key: ${{ secrets.RELEASE_PLEASE_TOKEN_PROVIDER_PEM }} | ||
| - name: Release Please | ||
| uses: googleapis/release-please-action@v4 | ||
| with: | ||
| token: ${{ steps.app-token.outputs.token }} | ||
| config-file: release-please-config.json | ||
| manifest-file: .release-please-manifest.json | ||
| manifest: true | ||
| primaryBranch: dev | ||
| handleGHRelease: true | ||
| dry-run: ${{ github.event.inputs.dry_run == 'true' }} | ||