fix conflicts

Author: jaeopt

.github/workflows/java.yml

@@ -30,12 +30,14 @@ jobs:
       run: find . -type f -name '*.md' -exec awesome_bot {} \;
 
   integration_tests:
-    uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master
+    if: ${{ startsWith(github.ref, 'refs/tags/') != true && github.event.inputs.SNAPSHOT != 'true' }}
+    uses: optimizely/java-sdk/.github/workflows/integration_test.yml@mnoman/fsc-gitaction-test
     secrets:
       CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }}
       TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
 
   fullstack_production_suite:
+    if: ${{ startsWith(github.ref, 'refs/tags/') != true && github.event.inputs.SNAPSHOT != 'true' }}
     uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master
     with:
       FULLSTACK_TEST_REPO: ProdTesting
@@ -44,8 +46,8 @@ jobs:
       TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
 
   test:
-    if: startsWith(github.ref, 'refs/tags/') != true
-    runs-on: ubuntu-18.04
+    if: ${{ startsWith(github.ref, 'refs/tags/') != true && github.event.inputs.SNAPSHOT != 'true' }}
+    runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix: