diff options
| author | Ting-Yuan Huang <laszio@google.com> | 2022-03-16 18:55:52 -0700 |
|---|---|---|
| committer | laszio <ting-yuan@users.noreply.github.com> | 2022-03-17 00:23:41 -0700 |
| commit | 68f3e5306d9571fe41a12df3cf82fb7b1bb32aec (patch) | |
| tree | 4dd1c58a54135065791fa0fe6486507594875ed4 /.github/workflows/auto-merge.yml | |
| parent | 384f0fe36552d512657a024143d63c380154dff2 (diff) | |
| download | ksp-68f3e5306d9571fe41a12df3cf82fb7b1bb32aec.tar.gz | |
Migrate compiler-plugin tests to new framework
Also updated auto-merger to detect compiler bumps by grepping
KOTLIN(underline)VERSION(underline)UPDATE
Diffstat (limited to '.github/workflows/auto-merge.yml')
| -rw-r--r-- | .github/workflows/auto-merge.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index db6fe191..5054caf0 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -24,7 +24,7 @@ jobs: - name: merge commits from main to release branch env: # space separated hashs - DONT_PICK: 42ef4e0b1696ddbcabbb188d7761c8692ca9f988 + DONT_PICK: 42ef4e0b1696ddbcabbb188d7761c8692ca9f988 6bb81cbc304a006b05e0fb4b6d46ec2d94d73357 e74a18cf092877c3a73c2c58f5fc36cc1b6e33b3 35e1556f6f329714a9d730ea4a7743317535ce1a 2ed353a57eb379a3b8fa6401cbf3a7abe3da7e8b d961b62f71147bfd148d8648bfdf566525a401e7 fbb02bfeafdb69b876bc6c0bd433fd1ebf4c8150 run: | # Cherry pick new changes from main, except for version bumps. # A commit is a version bump IFF it touches third_party/prebuilt/repo @@ -33,7 +33,7 @@ jobs: MERGE_BASE=$(git merge-base HEAD origin/main) CANDIDATES=$(git log --pretty=%H $MERGE_BASE..origin/main) PICKED=$(git log $MERGE_BASE..HEAD | sed -n "s/^[ ]*(cherry picked from commit \([a-z0-9]*\))$/\1/p") - VERSION_BUMPS=$(git log --pretty=%H $MERGE_BASE..origin/main third_party/prebuilt/repo) + VERSION_BUMPS=$(git log --pretty=%H --grep UPDATE_KOTLIN_VERSION) TO_PICK=$(grep -Fxv -f <(echo "$PICKED"; echo "$VERSION_BUMPS"; echo "$DONT_PICK") <(echo "$CANDIDATES") | tac) if [ -n "$TO_PICK" ]; then git cherry-pick -x $TO_PICK; fi @@ -75,7 +75,7 @@ jobs: # Run ksp generated tests - name: test - run: ./gradlew --stacktrace --info test -PcompilerTestEnabled=true + run: ./gradlew --stacktrace --info test - name: Upload test results if: always() uses: actions/upload-artifact@v2 |