Skip to content

Commit

Permalink
Merge pull request #2975 from regro/master-to-main
Browse files Browse the repository at this point in the history
feat: change default branch from master to main
  • Loading branch information
beckermr authored Sep 1, 2024
2 parents 681e423 + 87be103 commit dd26d8c
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 32 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/bot-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ jobs:
TMPDIR: ${{ runner.temp }}

- name: status of changes
if: github.ref == 'refs/heads/master' && always() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && always() && ! env.CI_SKIP
run: |
pushd cf-graph
git status
- name: deploy
if: github.ref == 'refs/heads/master' && always() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && always() && ! env.CI_SKIP
run: |
pushd cf-graph
Expand All @@ -85,7 +85,7 @@ jobs:
RUN_ID: ${{ github.run_id }}

- name: bump on fail
if: github.ref == 'refs/heads/master' && failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && failure() && ! env.CI_SKIP
run: |
export ACTION_URL="https://github.com/regro/cf-scripts/actions/runs/${RUN_ID}"
python cf-scripts/autotick-bot/bump_bot_team.py
Expand All @@ -96,7 +96,7 @@ jobs:

- name: trigger next job
uses: benc-uk/workflow-dispatch@25b02cc069be46d637e8fe2f1e8484008e9e9609 # v1.2.3
if: github.ref == 'refs/heads/master' && ! cancelled() && ! failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! failure() && ! env.CI_SKIP
with:
workflow: bot-bot
ref: ${{ github.event.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bot-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
- name: trigger next job
uses: benc-uk/workflow-dispatch@25b02cc069be46d637e8fe2f1e8484008e9e9609 # v1.2.3
if: github.ref == 'refs/heads/master' && ! cancelled() && ! failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! failure() && ! env.CI_SKIP
with:
workflow: bot-cache
ref: ${{ github.event.ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bot-feedstocks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
BOT_TOKEN: ${{ secrets.AUTOTICK_BOT_TOKEN }}

- name: deploy
if: github.ref == 'refs/heads/master' && ! cancelled() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! env.CI_SKIP
run: |
pushd cf-graph
Expand All @@ -68,7 +68,7 @@ jobs:
RUN_ID: ${{ github.run_id }}

- name: bump on fail
if: github.ref == 'refs/heads/master' && failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && failure() && ! env.CI_SKIP
run: |
export ACTION_URL="https://github.com/regro/cf-scripts/actions/runs/${RUN_ID}"
python cf-scripts/autotick-bot/bump_bot_team.py
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bot-keepalive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: trigger next job
uses: benc-uk/workflow-dispatch@25b02cc069be46d637e8fe2f1e8484008e9e9609 # v1.2.3
if: github.ref == 'refs/heads/master' && ! cancelled() && ! failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! failure() && ! env.CI_SKIP
with:
workflow: bot-bot
ref: ${{ github.event.ref }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/bot-make-graph.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
BOT_JOB: ${{ matrix.job_num }}

- name: deploy
if: github.ref == 'refs/heads/master' && always() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && always() && ! env.CI_SKIP
run: |
pushd cf-graph
Expand All @@ -74,7 +74,7 @@ jobs:
RUN_ID: ${{ github.run_id }}

- name: bump on fail
if: github.ref == 'refs/heads/master' && failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && failure() && ! env.CI_SKIP
run: |
export ACTION_URL="https://github.com/regro/cf-scripts/actions/runs/${RUN_ID}"
python cf-scripts/autotick-bot/bump_bot_team.py
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}

- name: deploy
if: github.ref == 'refs/heads/master' && always() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && always() && ! env.CI_SKIP
run: |
pushd cf-graph
Expand All @@ -147,14 +147,14 @@ jobs:

- name: trigger next job
uses: benc-uk/workflow-dispatch@25b02cc069be46d637e8fe2f1e8484008e9e9609 # v1.2.3
if: github.ref == 'refs/heads/master' && ! cancelled() && ! failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! failure() && ! env.CI_SKIP
with:
workflow: bot-make-graph
ref: ${{ github.event.ref }}
token: ${{ secrets.AUTOTICK_BOT_TOKEN }}

- name: bump on fail
if: github.ref == 'refs/heads/master' && failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && failure() && ! env.CI_SKIP
run: |
export ACTION_URL="https://github.com/regro/cf-scripts/actions/runs/${RUN_ID}"
python cf-scripts/autotick-bot/bump_bot_team.py
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/bot-make-migrators.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}

- name: deploy
if: github.ref == 'refs/heads/master' && always() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && always() && ! env.CI_SKIP
run: |
pushd cf-graph
Expand All @@ -71,14 +71,14 @@ jobs:

- name: trigger next job
uses: benc-uk/workflow-dispatch@25b02cc069be46d637e8fe2f1e8484008e9e9609 # v1.2.3
if: github.ref == 'refs/heads/master' && ! cancelled() && ! failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! failure() && ! env.CI_SKIP
with:
workflow: bot-make-migrators
ref: ${{ github.event.ref }}
token: ${{ secrets.AUTOTICK_BOT_TOKEN }}

- name: bump on fail
if: github.ref == 'refs/heads/master' && failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && failure() && ! env.CI_SKIP
run: |
export ACTION_URL="https://github.com/regro/cf-scripts/actions/runs/${RUN_ID}"
python cf-scripts/autotick-bot/bump_bot_team.py
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/bot-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}

- name: deploy
if: github.ref == 'refs/heads/master' && ! cancelled() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! env.CI_SKIP
run: |
pushd cf-graph
Expand All @@ -77,7 +77,7 @@ jobs:
RUN_ID: ${{ github.run_id }}

- name: bump on fail
if: github.ref == 'refs/heads/master' && failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && failure() && ! env.CI_SKIP
run: |
export ACTION_URL="https://github.com/regro/cf-scripts/actions/runs/${RUN_ID}"
python cf-scripts/autotick-bot/bump_bot_team.py
Expand Down Expand Up @@ -122,22 +122,22 @@ jobs:
- name: trigger next job
uses: benc-uk/workflow-dispatch@25b02cc069be46d637e8fe2f1e8484008e9e9609 # v1.2.3
if: github.ref == 'refs/heads/master' && ! cancelled() && ! failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! failure() && ! env.CI_SKIP
with:
workflow: bot-prs
ref: ${{ github.event.ref }}
token: ${{ secrets.AUTOTICK_BOT_TOKEN }}

- name: trigger status page
uses: benc-uk/workflow-dispatch@25b02cc069be46d637e8fe2f1e8484008e9e9609 # v1.2.3
if: github.ref == 'refs/heads/master' && ! cancelled() && ! failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! failure() && ! env.CI_SKIP
with:
workflow: bot-update-status-page
ref: ${{ github.event.ref }}
token: ${{ secrets.AUTOTICK_BOT_TOKEN }}

- name: bump on fail
if: github.ref == 'refs/heads/master' && failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && failure() && ! env.CI_SKIP
run: |
export ACTION_URL="https://github.com/regro/cf-scripts/actions/runs/${RUN_ID}"
python cf-scripts/autotick-bot/bump_bot_team.py
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bot-pypi-mapping.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
BOT_TOKEN: ${{ secrets.AUTOTICK_BOT_TOKEN }}

- name: deploy
if: github.ref == 'refs/heads/master' && ! cancelled() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! env.CI_SKIP
run: |
pushd cf-graph
Expand All @@ -78,7 +78,7 @@ jobs:
RUN_ID: ${{ github.run_id }}

- name: bump on fail
if: github.ref == 'refs/heads/master' && failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && failure() && ! env.CI_SKIP
run: |
export ACTION_URL="https://github.com/regro/cf-scripts/actions/runs/${RUN_ID}"
python cf-scripts/autotick-bot/bump_bot_team.py
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bot-update-status-page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
BOT_TOKEN: ${{ secrets.AUTOTICK_BOT_TOKEN }}

- name: deploy
if: github.ref == 'refs/heads/master' && ! cancelled() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! env.CI_SKIP
run: |
pushd cf-graph
Expand All @@ -66,7 +66,7 @@ jobs:
RUN_ID: ${{ github.run_id }}

- name: bump on fail
if: github.ref == 'refs/heads/master' && failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && failure() && ! env.CI_SKIP
run: |
export ACTION_URL="https://github.com/regro/cf-scripts/actions/runs/${RUN_ID}"
python cf-scripts/autotick-bot/bump_bot_team.py
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bot-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}

- name: deploy
if: github.ref == 'refs/heads/master' && ! cancelled() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && ! cancelled() && ! env.CI_SKIP
run: |
pushd cf-graph
Expand All @@ -74,7 +74,7 @@ jobs:
RUN_ID: ${{ github.run_id }}

- name: bump on fail
if: github.ref == 'refs/heads/master' && failure() && ! env.CI_SKIP
if: github.ref == 'refs/heads/main' && failure() && ! env.CI_SKIP
run: |
export ACTION_URL="https://github.com/regro/cf-scripts/actions/runs/${RUN_ID}"
python cf-scripts/autotick-bot/bump_bot_team.py
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch: null
push:
branches:
- master
- main

env:
PY_COLORS: "1"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: tests
on:
push:
branches:
- master
- main
pull_request: null
merge_group: null

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# autotick-bot

[![tests](https://github.com/regro/cf-scripts/actions/workflows/tests.yml/badge.svg)](https://github.com/regro/cf-scripts/actions/workflows/tests.yml)
[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/regro/cf-scripts/master.svg)](https://results.pre-commit.ci/latest/github/regro/cf-scripts/master)
[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/regro/cf-scripts/main.svg)](https://results.pre-commit.ci/latest/github/regro/cf-scripts/main)
[![bot-bot](https://github.com/regro/cf-scripts/actions/workflows/bot-bot.yml/badge.svg)](https://github.com/regro/cf-scripts/actions/workflows/bot-bot.yml)
[![bot-keepalive](https://github.com/regro/cf-scripts/actions/workflows/bot-keepalive.yml/badge.svg)](https://github.com/regro/cf-scripts/actions/workflows/bot-keepalive.yml)
[![bot-update-status-page](https://github.com/regro/cf-scripts/actions/workflows/bot-update-status-page.yml/badge.svg)](https://github.com/regro/cf-scripts/actions/workflows/bot-update-status-page.yml)
Expand Down Expand Up @@ -34,7 +34,7 @@ Check out the following pages for status information on the bot:

## Starting and Stopping the Worker

In order to start the worker, make a commit to master with the file `please.go`
In order to start the worker, make a commit to main with the file `please.go`
in the `autotick-bot` subdirectory.

If you want to stop the worker, rename the file to `please.stop`, and it will not restart
Expand Down
2 changes: 1 addition & 1 deletion autotick-bot/stop_me_if_needed.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def pushd(new_dir):
go = False

if not go:
print("I could not find the file 'please.go' on master! Stopping!")
print("I could not find the file 'please.go' on main! Stopping!")
subprocess.run(
'echo "CI_SKIP=1" >> $GITHUB_ENV',
shell=True,
Expand Down

0 comments on commit dd26d8c

Please sign in to comment.