Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update master branch references to main where suitable #112

Closed
wants to merge 1 commit into from
Closed

Update master branch references to main where suitable #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/draft_workflows/chatops.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Copy Repository Contents
uses: actions/checkout@master
uses: actions/checkout@v4

- name: create deployment
run: |
Expand Down
26 changes: 13 additions & 13 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: cache binder build on mybinder.org
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with:
NO_PUSH: true
MYBINDERORG_TAG: ${{ github.event.ref }} # This builds the container on mybinder.org with the branch that was pushed on.
Expand All @@ -189,7 +189,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: cache binder build on mybinder.org
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with:
NO_PUSH: true
MYBINDERORG_TAG: ${{ github.event.pull_request.head.ref }}
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}

- name: update jupyter dependencies with repo2docker
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -255,7 +255,7 @@ jobs:
uses: actions/checkout@main

- name: update jupyter dependencies with repo2docker
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
Expand Down Expand Up @@ -300,7 +300,7 @@ to any particular cloud vendor.
uses: actions/checkout@main

- name: update jupyter dependencies with repo2docker
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with: # make sure username & password/token matches your registry
DOCKER_USERNAME: ${{ secrets.QUAY_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
Expand Down Expand Up @@ -351,7 +351,7 @@ Once done, it will give you an 'Access key ID' and the 'Secret access key'.


- name: Update jupyter dependencies with repo2docker
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with:
DOCKER_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
IMAGE_NAME: "<aws-username>/<repository-name>"
Expand Down Expand Up @@ -400,7 +400,7 @@ Once done, it will give you an 'Access key ID' and the 'Secret access key'.
password: ${{ secrets.GCP_SA_KEY }}

- name: Update jupyter dependencies with repo2docker
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with:
DOCKER_REGISTRY: gcr.io
IMAGE_NAME: ${{ secrets.GCP_PROJECT_ID }}/<repository-name>
Expand Down Expand Up @@ -448,7 +448,7 @@ Once done, it will give you an 'Access key ID' and the 'Secret access key'.
password: ${{ secrets.GCP_SA_KEY }}

- name: Update jupyter dependencies with repo2docker
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with:
DOCKER_REGISTRY: <location>-docker.pkg.dev
IMAGE_NAME: ${{ secrets.GCP_PROJECT_ID }}/<repository-name>
Expand Down Expand Up @@ -481,7 +481,7 @@ Once done, it will give you an 'Access key ID' and the 'Secret access key'.
uses: actions/checkout@main

- name: Update jupyter dependencies with repo2docker
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with:
DOCKER_USERNAME: ${{ secrets.ACR_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.ACR_PASSWORD }}
Expand All @@ -506,7 +506,7 @@ jobs:
uses: actions/checkout@main

- name: update jupyter dependencies with repo2docker
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with: # make sure username & password/token matches your registry
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -530,7 +530,7 @@ jobs:
# docker registry before running the repo2docker-action

- name: update jupyter dependencies with repo2docker
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with:
DOCKER_REGISTRY: your-registry.example.org
IMAGE_NAME: your-image-name
Expand All @@ -552,7 +552,7 @@ jobs:
uses: actions/checkout@main

- name: update jupyter dependencies with repo2docker
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -576,7 +576,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}

- name: test build
uses: jupyterhub/repo2docker-action@master
uses: jupyterhub/repo2docker-action@main
with:
NO_PUSH: 'true'
IMAGE_NAME: "hamelsmu/repo2docker-test"
Expand Down
2 changes: 1 addition & 1 deletion action_files/create_deployment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
response = requests.post(url=url, headers=headers, json=data)
assert response, f"Error: attempt to create deployment failed, received {response.status_code}"

# if you get a 202 this means that it needs to merge master into the current branch
# if you get a 202 this means that it needs to merge main into the current branch
if response.status_code == 202:
response = requests.post(url=url, headers=headers, json=data)
assert response, f"Error: attempt to create deployment failed, received {response.status_code}"
Expand Down
2 changes: 1 addition & 1 deletion trigger_binder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#!/usr/bin/env bash
# from https://github.com/scikit-hep/pyhf/blob/master/binder/trigger_binder.sh
# from https://github.com/scikit-hep/pyhf/blob/main/binder/trigger_binder.sh

function trigger_binder() {
local URL="${1}"
Expand Down
Loading