Merge branch 'main' of github.com:jspecify/nullness-checker-for-check…

…er-framework into conformance-test-artifacts

.github/workflows/build.yml

@@ -20,13 +20,13 @@ jobs:
           arguments: build
         env:
           SHALLOW: 1
-      - name: Run Samples Tests
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: jspecifySamplesTest
-      - name: Check out jspecify/main
-        run: git -C ../jspecify checkout main
       - name: Run Conformance Tests
         uses: gradle/gradle-build-action@v2
         with:
           arguments: conformanceTest conformanceTestOnSamples
+      - name: Check out jspecify/samples-google-prototype
+        run: git -C ../jspecify checkout samples-google-prototype
+      - name: Run Samples Tests
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: jspecifySamplesTest

initialize-project

@@ -63,10 +63,9 @@ git_clone() {
   run "${git[@]}" "https://github.com/jspecify/${repo}.git" "../${repo}"
 }
 
-# We test using some modified samples in a different branch of the jspecify
-# repo, so we check out that branch. However, we fetch all branches even when
-# SHALLOW is set so we can run conformance tests.
-git_clone jspecify --no-single-branch --branch samples-google-prototype
+# Fetch all branches even when $SHALLOW is set so we can check out
+# samples-google-prototype to run samples tests.
+git_clone jspecify --no-single-branch
 
 git_clone jdk --depth 1 --single-branch