diff --git a/.github/workflows/presubmit.yaml b/.github/workflows/presubmit.yaml index 0fad8d3a7..b262afe0d 100644 --- a/.github/workflows/presubmit.yaml +++ b/.github/workflows/presubmit.yaml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: true matrix: - bot: [CHECK_BOT, DART_BOT, UNIT_TEST_BOT] + bot: [CHECK_BOT, DART_BOT, UNIT_TEST_BOT, VERIFY_BOT] steps: - name: checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 diff --git a/.github/workflows/presubmit.yaml.template b/.github/workflows/presubmit.yaml.template index 390f8bef3..cb35c9e45 100644 --- a/.github/workflows/presubmit.yaml.template +++ b/.github/workflows/presubmit.yaml.template @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: true matrix: - bot: [CHECK_BOT, DART_BOT, UNIT_TEST_BOT] + bot: [CHECK_BOT, DART_BOT, UNIT_TEST_BOT, VERIFY_BOT] steps: - name: checkout uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 diff --git a/tool/github.sh b/tool/github.sh index d717810d9..6f90f38b9 100755 --- a/tool/github.sh +++ b/tool/github.sh @@ -75,8 +75,21 @@ elif [ "UNIT_TEST_BOT" = "$BOT" ] ; then # Run unit tests. ./bin/plugin test --no-setup -else +elif [ "VERIFY_BOT" = "$BOT" ] ; then + + # Before running gradlew verifyPlugin +# echo "Checking permissions for /home/runner/" +# ls -ld /home/runner/ +# echo "Creating .pluginVerifier/extracted-plugins directory if it doesn't exist..." +# #mkdir -p /home/runner/.pluginVerifier +# rm /home/runner/.pluginVerifier/extracted-plugins +# echo "Checking permissions for /home/runner/.pluginVerifier" +# ls -ld /home/runner/.pluginVerifier + # Run the vefifier for this version + ./bin/plugin verify + +else # Run the build. ./bin/plugin make --channel=stable --only-version=$IDEA_VERSION --no-setup diff --git a/tool/plugin/lib/verify.dart b/tool/plugin/lib/verify.dart index 278f84235..2b2c9a55a 100644 --- a/tool/plugin/lib/verify.dart +++ b/tool/plugin/lib/verify.dart @@ -47,36 +47,36 @@ class VerifyCommand extends ProductCommand { // run './gradlew verifyPlugin' var result = 0; for (var spec in buildSpecs) { - log('\nverifyPluginProjectConfiguration for $spec:'); - result = await runner.runGradleCommand( - ['verifyPluginProjectConfiguration'], - spec, - '1', - 'false', - ); - if (result != 0) { - return result; - } - log('\nverifyPluginStructure for $spec:'); - result = await runner.runGradleCommand( - ['verifyPluginStructure'], - spec, - '1', - 'false', - ); - if (result != 0) { - return result; - } - log('\nverifyPluginSignature for $spec:'); - result = await runner.runGradleCommand( - ['verifyPluginSignature'], - spec, - '1', - 'false', - ); - if (result != 0) { - return result; - } + // log('\nverifyPluginProjectConfiguration for $spec:'); + // result = await runner.runGradleCommand( + // ['verifyPluginProjectConfiguration'], + // spec, + // '1', + // 'false', + // ); + // if (result != 0) { + // return result; + // } + // log('\nverifyPluginStructure for $spec:'); + // result = await runner.runGradleCommand( + // ['verifyPluginStructure'], + // spec, + // '1', + // 'false', + // ); + // if (result != 0) { + // return result; + // } + // log('\nverifyPluginSignature for $spec:'); + // result = await runner.runGradleCommand( + // ['verifyPluginSignature'], + // spec, + // '1', + // 'false', + // ); + // if (result != 0) { + // return result; + // } log('\nverifyPlugin for $spec:'); result = await runner.runGradleCommand( ['verifyPlugin'],