diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d16c8efab..5790d96829 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: env.ACT != 'true' && github.repository == 'zotero/zotero' && github.event_name == 'push' - && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/fx102' || endsWith(github.ref, '-hotfix') || github.ref == 'refs/heads/gh-actions-ci-test') + && (github.ref == 'refs/heads/master' || endsWith(github.ref, '-hotfix')) env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/app/scripts/7.0_beta_build_and_deploy b/app/scripts/7.0_beta_build_and_deploy index fa2a33ddf9..1a9ee82eac 100755 --- a/app/scripts/7.0_beta_build_and_deploy +++ b/app/scripts/7.0_beta_build_and_deploy @@ -7,7 +7,7 @@ ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")" . "$APP_ROOT_DIR/config.sh" CHANNEL="beta" -BRANCH="fx102" +BRANCH="master" export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/beta/ZoteroSafariExtension.appex" cd "$SCRIPT_DIR" diff --git a/app/scripts/7.0_dev_build_and_deploy b/app/scripts/7.0_dev_build_and_deploy index cc37766c69..d2f46d811c 100755 --- a/app/scripts/7.0_dev_build_and_deploy +++ b/app/scripts/7.0_dev_build_and_deploy @@ -7,7 +7,7 @@ ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")" . "$APP_ROOT_DIR/config.sh" CHANNEL="dev" -BRANCH="fx102" +BRANCH="master" export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/dev/ZoteroSafariExtension.appex" cd "$SCRIPT_DIR" diff --git a/app/scripts/7.0_test_build_and_deploy b/app/scripts/7.0_test_build_and_deploy index e21ea49b02..88fd6da467 100755 --- a/app/scripts/7.0_test_build_and_deploy +++ b/app/scripts/7.0_test_build_and_deploy @@ -7,7 +7,7 @@ ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")" . "$APP_ROOT_DIR/config.sh" CHANNEL="test" -BRANCH="fx102" +BRANCH="master" #export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/dev/ZoteroSafariExtension.appex" cd "$SCRIPT_DIR"