Skip to content

Add generated files to target source sets #431

Add generated files to target source sets

Add generated files to target source sets #431

Workflow file for this run

# Workflow to cherry-pick changes from main to release branch.
name: auto-merge
on:
push:
branches: [ main ]
jobs:
build-and-test:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest ]
# The type of runner that the job will run on
runs-on: ${{ matrix.os }}
steps:
# Checkout
- uses: actions/checkout@v2
with:
fetch-depth: 0
ref: 1.0.14-release
- name: merge commits from main to release branch
run: |
# Cherry pick new changes from main, except for version bumps.
# A commit is a version bump IFF it touches third_party/prebuilt/repo
DONT_PICK=$(cat <<EOF
a0ec95f02b561fad1473a36ec7788aa6689db9ed
f1a7ae788e1f94df04bcd6d7eebfb0d8f487e429
15e9b54fe5b3e1c51e748b2856196e1eed6c4483
23a7adb763ca01c24db3a83fa17227ef218d3fdc
e951fb9c14defe19072b1d3b78e48eedc1fb1b77
EOF
)
git config --global user.email "kotlin-symbol-processing@google.com"
git config --global user.name "KSP Auto Pick"
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 $MERGE_BASE..origin/main --pretty=%H --grep UPDATE_KOTLIN_VERSION)
TO_PICK=$(grep -Fxv -f <(echo "$PICKED"; echo "$VERSION_BUMPS"; echo "$DONT_PICK") <(echo "$CANDIDATES") | awk '{a[i++]=$0} END {for (j=i-1; j>=0;) print a[j--] }')
echo Picking $TO_PICK
if [ -n "$TO_PICK" ]; then git cherry-pick -x $TO_PICK; fi
- name: Setup Java 9
uses: actions/setup-java@v1.4.3
with:
java-version: '9'
java-package: jdk
architecture: x64
- name: set JDK_9 environment variable for kotlin compiler
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
run: echo ::set-env name=JDK_9::$(echo $JAVA_HOME)
- name: Setup Java 11
uses: actions/setup-java@v1.4.3
with:
java-version: '11'
java-package: jdk
architecture: x64
# Build cache
- name: Cache Gradle Cache
uses: actions/cache@v2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('**/gradle.properties') }}
# An ordered list of keys to use for restoring the cache if no cache hit occurred for key
restore-keys: |
${{ runner.os }}-gradle-
- name: Cache gradle wrapper
uses: actions/cache@v2
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
# Check API compatibility
- name: API compatibility check
run: ./gradlew :api:checkApi
# Run ksp generated tests
- name: test
run: ./gradlew --stacktrace --info test
- name: Upload test results
if: always()
uses: actions/upload-artifact@v3
with:
name: test-reports
path: |
compiler-plugin/build/reports
integration-tests/build/reports
gradle-plugin/build/reports
common-util/build/reports
kotlin-analysis-api/build/reports
pick-and-push:
needs: build-and-test
runs-on: ubuntu-latest
steps:
# Checkout
- uses: actions/checkout@v2
with:
fetch-depth: 0
ref: 1.0.14-release
- name: merge commits from main to release branch
run: |
# Cherry pick new changes from main, except for version bumps.
# A commit is a version bump IFF it touches third_party/prebuilt/repo
DONT_PICK=$(cat <<EOF
a0ec95f02b561fad1473a36ec7788aa6689db9ed
f1a7ae788e1f94df04bcd6d7eebfb0d8f487e429
15e9b54fe5b3e1c51e748b2856196e1eed6c4483
23a7adb763ca01c24db3a83fa17227ef218d3fdc
e951fb9c14defe19072b1d3b78e48eedc1fb1b77
EOF
)
git config --global user.email "kotlin-symbol-processing@google.com"
git config --global user.name "KSP Auto Pick"
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 $MERGE_BASE..origin/main --pretty=%H --grep UPDATE_KOTLIN_VERSION)
TO_PICK=$(grep -Fxv -f <(echo "$PICKED"; echo "$VERSION_BUMPS"; echo "$DONT_PICK") <(echo "$CANDIDATES") | tac)
echo Picking $TO_PICK
if [ -n "$TO_PICK" ]; then git cherry-pick -x $TO_PICK; fi
- name: push to release branch
run: git push origin