From b98db8dcc7f3f9d1b5883116acaa7a90175a583d Mon Sep 17 00:00:00 2001 From: MYJ Date: Wed, 26 Feb 2025 21:18:42 +0800 Subject: [PATCH 1/3] 6 --- .gitea/workflows/deploy-dev-demo.yaml | 3 ++- .gitea/workflows/deploy-main-demo.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy-dev-demo.yaml b/.gitea/workflows/deploy-dev-demo.yaml index e91e455..d05953d 100644 --- a/.gitea/workflows/deploy-dev-demo.yaml +++ b/.gitea/workflows/deploy-dev-demo.yaml @@ -9,6 +9,7 @@ jobs: Explore-Gitea-Actions: runs-on: home steps: + - run: echo "event_name=${{ gitea.event_name }};merged=${{ gitea.event.pull_request.merged }};gitea.ref=${{ gitea.ref }}" - name: 部署到测试环境 - if: github.ref == 'refs/heads/dev' + if: ${{ gitea.ref == 'refs/heads/dev' }} run: echo "dev" \ No newline at end of file diff --git a/.gitea/workflows/deploy-main-demo.yaml b/.gitea/workflows/deploy-main-demo.yaml index ed98844..cc6ea08 100644 --- a/.gitea/workflows/deploy-main-demo.yaml +++ b/.gitea/workflows/deploy-main-demo.yaml @@ -2,7 +2,6 @@ name: deploy to main on: pull_request: - # Sequence of patterns matched against refs/heads branches: - main @@ -10,6 +9,7 @@ jobs: Explore-Gitea-Actions: runs-on: home steps: + - run: echo "event_name=${{ gitea.event_name }};merged=${{ gitea.event.pull_request.merged }};gitea.ref=${{ gitea.ref }}" - name: 部署到生产环境 - if: github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.ref == 'refs/heads/main' + if: ${{ gitea.event_name == 'pull_request' && gitea.event.pull_request.merged == true && gitea.ref == 'refs/heads/main' }} run: echo "prod" \ No newline at end of file From 037058e937273681b70f65a2b717dcdc6ffa21bf Mon Sep 17 00:00:00 2001 From: MYJ Date: Wed, 26 Feb 2025 21:20:41 +0800 Subject: [PATCH 2/3] 7 --- .gitea/workflows/deploy-dev-demo.yaml | 4 +++- .gitea/workflows/deploy-main-demo.yaml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy-dev-demo.yaml b/.gitea/workflows/deploy-dev-demo.yaml index d05953d..6386ed9 100644 --- a/.gitea/workflows/deploy-dev-demo.yaml +++ b/.gitea/workflows/deploy-dev-demo.yaml @@ -12,4 +12,6 @@ jobs: - run: echo "event_name=${{ gitea.event_name }};merged=${{ gitea.event.pull_request.merged }};gitea.ref=${{ gitea.ref }}" - name: 部署到测试环境 if: ${{ gitea.ref == 'refs/heads/dev' }} - run: echo "dev" \ No newline at end of file + run: echo "dev" + if: ${{ gitea.ref == 'refs/heads/main' }} + run: echo "main" \ No newline at end of file diff --git a/.gitea/workflows/deploy-main-demo.yaml b/.gitea/workflows/deploy-main-demo.yaml index cc6ea08..dc9a29d 100644 --- a/.gitea/workflows/deploy-main-demo.yaml +++ b/.gitea/workflows/deploy-main-demo.yaml @@ -12,4 +12,6 @@ jobs: - run: echo "event_name=${{ gitea.event_name }};merged=${{ gitea.event.pull_request.merged }};gitea.ref=${{ gitea.ref }}" - name: 部署到生产环境 if: ${{ gitea.event_name == 'pull_request' && gitea.event.pull_request.merged == true && gitea.ref == 'refs/heads/main' }} - run: echo "prod" \ No newline at end of file + run: echo "main" + if: ${{ gitea.ref == 'refs/heads/dev' }} + run: echo "dev" \ No newline at end of file From dcb27094fe1c41bce7548554f24ce52381c3da29 Mon Sep 17 00:00:00 2001 From: MYJ Date: Wed, 26 Feb 2025 21:29:46 +0800 Subject: [PATCH 3/3] 8 --- .gitea/workflows/deploy-dev-demo.yaml | 10 +++++++--- .gitea/workflows/deploy-main-demo.yaml | 14 +++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/deploy-dev-demo.yaml b/.gitea/workflows/deploy-dev-demo.yaml index 6386ed9..71c9b6e 100644 --- a/.gitea/workflows/deploy-dev-demo.yaml +++ b/.gitea/workflows/deploy-dev-demo.yaml @@ -9,9 +9,13 @@ jobs: Explore-Gitea-Actions: runs-on: home steps: - - run: echo "event_name=${{ gitea.event_name }};merged=${{ gitea.event.pull_request.merged }};gitea.ref=${{ gitea.ref }}" - - name: 部署到测试环境 + - 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" - if: ${{ gitea.ref == 'refs/heads/main' }} + + - name: 部署到生产环境(main) + if: ${{ gitea.event_name == 'pull_request' && gitea.event.pull_request.merged == true && gitea.ref == 'refs/heads/main' }} run: echo "main" \ No newline at end of file diff --git a/.gitea/workflows/deploy-main-demo.yaml b/.gitea/workflows/deploy-main-demo.yaml index dc9a29d..4c28dfb 100644 --- a/.gitea/workflows/deploy-main-demo.yaml +++ b/.gitea/workflows/deploy-main-demo.yaml @@ -9,9 +9,13 @@ jobs: Explore-Gitea-Actions: runs-on: home steps: - - run: echo "event_name=${{ gitea.event_name }};merged=${{ gitea.event.pull_request.merged }};gitea.ref=${{ gitea.ref }}" - - name: 部署到生产环境 - if: ${{ gitea.event_name == 'pull_request' && gitea.event.pull_request.merged == true && gitea.ref == 'refs/heads/main' }} - run: echo "main" + - 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" \ No newline at end of file + 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" \ No newline at end of file