Merge pull request 'dev' (#3) from dev into main

Reviewed-on: #3
This commit was merged in pull request #3.
This commit is contained in:
liujitian committed 2025-02-26 13:31:10 +00:00
commit 124740f4c6
2 files changed
+19 -6

No files matched your search

+9 -2
View File
@@ -9,6 +9,13 @@ jobs:
Explore-Gitea-Actions:
runs-on: home
steps:
- name: 部署到测试环境
if: github.ref == 'refs/heads/dev'
- name: 输出事件信息
run: echo "event_name=${{ gitea.event_name }};merged=${{ gitea.event.pull_request.merged }};gitea.ref=${{ gitea.ref }}"
- name: 部署到测试环境(dev)
if: ${{ gitea.ref == 'refs/heads/dev' }}
run: echo "dev"
- name: 部署到生产环境(main)
if: ${{ gitea.event_name == 'pull_request' && gitea.event.pull_request.merged == true && gitea.ref == 'refs/heads/main' }}
run: echo "main"
+10 -4
View File
@@ -2,7 +2,6 @@ name: deploy to main
on:
pull_request:
# Sequence of patterns matched against refs/heads
branches:
- main
@@ -10,6 +9,13 @@ jobs:
Explore-Gitea-Actions:
runs-on: home
steps:
- name: 部署到生产环境
if: github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.ref == 'refs/heads/main'
run: echo "prod"
- name: 输出事件信息
run: echo "event_name=${{ gitea.event_name }};merged=${{ gitea.event.pull_request.merged }};gitea.ref=${{ gitea.ref }}"
- name: 部署到测试环境(dev)
if: ${{ gitea.ref == 'refs/heads/dev' }}
run: echo "dev"
- name: 部署到生产环境(main)
if: ${{ gitea.event_name == 'pull_request' && gitea.event.pull_request.merged == true && gitea.ref == 'refs/heads/main' }}
run: echo "main"