Merge branch 'next' into test/cost-vote-integration

.github/workflows/bitcoin-tests.yml

@@ -1,10 +1,6 @@
 name: stacks-bitcoin-integration-tests
 
-# Only run when:
-#   - tags starting with "v" get pushed
-#   - PRs are opened against the master branch
-#   - the workflow is started from the UI (an optional tag can be passed in via parameter)
-#     - If the optional tag parameter is passed in, a new tag will be generated based off the selected branch
+# Only run on PRs
 on:
   pull_request:
 
@@ -19,6 +15,9 @@ jobs:
           DOCKER_BUILDKIT: 1
         run: docker build -f ./.github/actions/bitcoin-int-tests/Dockerfile.bitcoin-tests .
   atlas-test:
+    # disable this job/test for now, since we haven't seen this pass
+    #  on github actions in a while
+    if: ${{ false }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2