diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index dd685de..c0175b3 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -28,13 +28,12 @@ permissions: jobs: docker-opts: if: | - github.event_name == 'workflow_dispatch' || - (github.event_name == 'pull_request' && github.event.pull_request.merged == true) + github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.base.ref || github.ref }} + with + ref: ${{ github.event.pull_request.base.ref }} - name: Get tag shell: bash diff --git a/.github/workflows/prod.yaml b/.github/workflows/prod.yaml index 9b3c652..3647eaf 100644 --- a/.github/workflows/prod.yaml +++ b/.github/workflows/prod.yaml @@ -9,11 +9,6 @@ on: - main types: [closed] workflow_dispatch: - inputs: - logLevel: - description: "Log level" - required: true - default: "debug" env: APP_NAME: assistant-us-prod @@ -32,13 +27,12 @@ permissions: jobs: docker-opts: if: | - github.event_name == 'workflow_dispatch' || - (github.event_name == 'pull_request' && github.event.pull_request.merged == true) + github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.base.ref || github.ref }} + ref: ${{ github.event.pull_request.base.ref }} - name: Get tag shell: bash