mirror of
https://github.com/Lapikud/tipilan.git
synced 2026-06-22 22:24:43 +00:00
fix workflow conflict
This commit is contained in:
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@@ -2,12 +2,6 @@ name: build
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_call:
|
workflow_call:
|
||||||
inputs:
|
|
||||||
ref:
|
|
||||||
description: Branch or tag to checkout
|
|
||||||
required: false
|
|
||||||
default: teaser-2026
|
|
||||||
type: string
|
|
||||||
secrets:
|
secrets:
|
||||||
USER_AUTH:
|
USER_AUTH:
|
||||||
required: true
|
required: true
|
||||||
@@ -23,8 +17,6 @@ jobs:
|
|||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
ref: ${{ inputs.ref }}
|
|
||||||
|
|
||||||
- name: Setup Bun
|
- name: Setup Bun
|
||||||
uses: oven-sh/setup-bun@v2
|
uses: oven-sh/setup-bun@v2
|
||||||
|
|||||||
9
.github/workflows/main.yml
vendored
9
.github/workflows/main.yml
vendored
@@ -4,19 +4,10 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
ref:
|
|
||||||
description: Branch or tag to build and deploy
|
|
||||||
required: false
|
|
||||||
default: teaser-2026
|
|
||||||
type: string
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
uses: ./.github/workflows/build.yml
|
uses: ./.github/workflows/build.yml
|
||||||
with:
|
|
||||||
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.ref || github.ref_name }}
|
|
||||||
secrets:
|
secrets:
|
||||||
USER_AUTH: ${{ secrets.USER_AUTH }}
|
USER_AUTH: ${{ secrets.USER_AUTH }}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user