aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiaxiang Chen <jiaxiang@google.com>2024-05-21 13:28:14 -0700
committerKSP Auto Pick <kotlin-symbol-processing@google.com>2024-05-21 21:55:43 +0000
commit2bda46794bdde75cb79b41bfb2aa2867872c499c (patch)
treea3cf25b6feb6cb998908da81bd7b9deef04f14f8
parent1ea95c217f6d331eb532f530a6c476cc2fb4c19d (diff)
downloadksp-upstream-1.0.21-release.tar.gz
set release branch to 1.0.22-releaseupstream-1.0.21-release
(cherry picked from commit 06a1a588c63ab73a4dc41f4cf4cf6857b8cce1a2)
-rw-r--r--.github/workflows/auto-merge.yml4
-rw-r--r--.github/workflows/main.yml4
-rw-r--r--.github/workflows/nightly.yml2
3 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index fd5a21b5..f684fd5c 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- ref: 1.0.21-release
+ ref: 1.0.22-release
- name: merge commits from main to release branch
run: |
@@ -109,7 +109,7 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- ref: 1.0.21-release
+ ref: 1.0.22-release
- name: merge commits from main to release branch
run: |
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f695b563..3fc5efa5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,9 +4,9 @@ name: CI
on:
push:
- branches: [ main, 1.0.20-release, 1.0.21-release ]
+ branches: [ main, 1.0.22-release, 1.0.21-release ]
pull_request:
- branches: [ main, 1.0.20-release, 1.0.21-release ]
+ branches: [ main, 1.0.22-release, 1.0.21-release ]
jobs:
build-and-test:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1389df42..f64052fe 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- branch: [ main, 1.0.21-release, 1.0.20-release ]
+ branch: [ main, 1.0.21-release, 1.0.22-release ]
runs-on: windows-latest
steps:
- name: configure Pagefile