Skip to content

Commit

Permalink
Change branch (#390)
Browse files Browse the repository at this point in the history
  • Loading branch information
anxolin authored Apr 6, 2022
1 parent 1100849 commit deb9593
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/prepare_production_deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if [ -n "$VERSION_TAG" ] && [ -n "$PROD_DEPLOYMENT_HOOK_TOKEN" ] && [ -n "$PROD_
then
curl --silent --output /dev/null --write-out "%{http_code}" -X POST \
-F token="$PROD_DEPLOYMENT_HOOK_TOKEN" \
-F ref=master \
-F ref=main \
-F "variables[TRIGGER_RELEASE_COMMIT_TAG]=$VERSION_TAG" \
$PROD_DEPLOYMENT_HOOK_URL
else
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: CI

on:
# build on PR creation/updates, also when pushing to master/develop, or create a release
# build on PR creation/updates, also when pushing to main/develop, or create a release
pull_request:
types: [opened, synchronize]
push:
branches: [master, develop]
branches: [main, develop]
tags: [v*]


env:
REPO_NAME_SLUG: gpswapui
REPO_NAME_SLUG: cowswap
PR_NUMBER: ${{ github.event.number }}
REACT_APP_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
REACT_APP_PINATA_API_KEY: ${{ secrets.REACT_APP_PINATA_API_KEY }}
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
run: aws s3 sync website s3://${{ secrets.AWS_DEV_BUCKET_NAME }} --delete

- name: 'Deploy to S3: Staging'
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'
run: aws s3 sync website s3://${{ secrets.AWS_STAGING_BUCKET_NAME }}/current --delete

- name: Get the version
Expand Down

0 comments on commit deb9593

Please sign in to comment.