ci(fix): fix workflow file conflicts

This commit is contained in:
ElyPrism 2025-10-05 20:54:52 +08:00 committed by GitHub
parent 72526ba20d
commit a76576af23
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -2,11 +2,8 @@ name: Publish Docker image
on: on:
push: push:
branches: branches: [main, master]
- main tags: ["v*"]
- master
tags:
- "v*"
workflow_dispatch: workflow_dispatch:
jobs: jobs:
@ -14,32 +11,15 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# 1⃣ 检出代码
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
# 2⃣ 设置 Node 环境(可选:若需打包前构建)
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 18
# 3⃣ 安装依赖与构建(如果你的 app 直接运行 app.js可略
- name: Install dependencies
run: npm ci
- name: Build (optional)
run: |
echo "Build step skipped — app.js already entry point."
# 4⃣ 登录 Docker Hub
- name: Log in to Docker Hub - name: Log in to Docker Hub
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
# 5⃣ 构建并推送镜像
- name: Build and push Docker image - name: Build and push Docker image
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
@ -48,8 +28,4 @@ jobs:
tags: | tags: |
moefurina/ncm-api:latest moefurina/ncm-api:latest
moefurina/ncm-api:${{ github.sha }} moefurina/ncm-api:${{ github.sha }}
platforms: linux/amd64,linux/arm64 platforms: linux/amd64
# 6⃣ (可选)输出镜像摘要
- name: Image digest
run: echo "Pushed image digest ${{ steps.docker_build.outputs.digest }}"