Просмотр исходного кода

Merge pull request #1467 from weseek/master

release v3.6.0 (2)
Yuki Takei 6 лет назад
Родитель
Сommit
d6c8fb444b
4 измененных файлов с 10 добавлено и 5 удалено
  1. 1 1
      .github/workflows/build-rc.yml
  2. 1 1
      .github/workflows/build.yml
  3. 6 1
      .github/workflows/ci.yml
  4. 2 2
      .github/workflows/release.yml

+ 1 - 1
.github/workflows/build-rc.yml

@@ -3,7 +3,7 @@ name: Release Docker Images for RC
 on:
 on:
   push:
   push:
     branches:
     branches:
-      - rc/*
+      - rc/**
 
 
 jobs:
 jobs:
 
 

+ 1 - 1
.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Release Docker Images
 on:
 on:
   push:
   push:
     tags:
     tags:
-      - v3.*
+      - v3.*.*
 
 
 jobs:
 jobs:
 
 

+ 6 - 1
.github/workflows/ci.yml

@@ -1,6 +1,11 @@
 name: Node CI
 name: Node CI
 
 
-on: [push]
+on:
+  push:
+    branches-ignore:
+      - release/**
+    tags-ignore:
+      - v*.*.*
 
 
 jobs:
 jobs:
 
 

+ 2 - 2
.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: GitHub Release
 on:
 on:
   push:
   push:
     branches:
     branches:
-      - release/current
+      - release/**
 
 
 jobs:
 jobs:
   build:
   build:
@@ -33,5 +33,5 @@ jobs:
       uses: ad-m/github-push-action@master
       uses: ad-m/github-push-action@master
       with:
       with:
         branch: null
         branch: null
-        github_token: ${{ secrets. GITHUB_TOKEN }}
+        github_token: ${{ secrets.GITHUB_TOKEN }}