diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 14cca142..85ba1403 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,8 +6,8 @@ updates: directory: "/" schedule: interval: "weekly" - # Raise pull requests against the "master" branch - target-branch: "master" + # Raise pull requests against the "main" branch + target-branch: "main" # Allow up to 10 open pull requests open-pull-requests-limit: 10 # Use custom labels on pull requests for Docker version updates diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index b2f3b99a..63138ccc 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -94,7 +94,7 @@ jobs: run: make release - name: AWS, credentials setup - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/main' }} uses: aws-actions/configure-aws-credentials@v4 with: aws-region: us-west-1 @@ -102,7 +102,7 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - name: Deploy updated builds to staging - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/main' }} id: build run: | ./deployment/deploy-qa.sh \ No newline at end of file diff --git a/bower.json b/bower.json index a32f10b0..20ba1005 100644 --- a/bower.json +++ b/bower.json @@ -7,7 +7,7 @@ "description": "The Branch Web SDK provides an easy way to interact with the Branch API, to track and attribute mobile app downloads and referrals.", "version": "2.71.0", "main": "dist/build.min.js", - "license": "https://github.com/BranchMetrics/Web-SDK/blob/master/LICENSE", + "license": "https://github.com/BranchMetrics/Web-SDK/blob/main/LICENSE", "homepage": "http://branch.io", "repository": { "type": "git", diff --git a/deployment/master_builds.sh b/deployment/master_builds.sh deleted file mode 100755 index 017e4b51..00000000 --- a/deployment/master_builds.sh +++ /dev/null @@ -1,38 +0,0 @@ -#/bin/bash - -# To trigger a production deploy push a -# commit with these items: -# -# version: x.y.z -# Changelog: - -set -e - -RED='\033[0;31m' -GREEN='\033[0;32m' -NC='\033[0m' - - -#-------------------------------------------------------------------------------------------- -# Master Deploy -#-------------------------------------------------------------------------------------------- - -if [ "$CIRCLE_BRANCH" == 'master' ]; then - - echo -en "${GREEN}QA Release...${NC}\n" - - echo -en "${GREEN}make release ...${NC}\n" - make release - - echo -en "${GREEN}Pushing to S3: branch-builds ...${NC}\n" - aws s3 cp --content-type="text/javascript" --content-encoding="gzip" dist/build.min.js.gz s3://branch-builds/websdk/branch-$VERSION.min.js --acl public-read - aws s3 cp --content-type="text/javascript" --content-encoding="gzip" dist/build.min.js.gz s3://branch-builds/websdk/branch-latest.min.js --acl public-read - aws s3 cp --content-type="text/javascript" --content-encoding="gzip" dist/build.min.js.gz s3://branch-builds/websdk/branch-v2.0.0.min.js --acl public-read - aws s3 cp --content-type="text/javascript" dist/build.js s3://branch-builds/websdk/branch.js --acl public-read - aws s3 cp example.html s3://branch-builds/websdk/example.html --acl public-read - -else - - echo -en "${GREEN}Not master .. skipping${NC}\n" - -fi