Merge pull request #121 from consideRatio/revert

Revert "Update master branch references to main where suitable"
jupyterhub · Mar 26, 2024 · 73f40a6 · 73f40a6
2 parents 3608017 + cccd4e2
commit 73f40a6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/draft_workflows/chatops.yaml b/.github/draft_workflows/chatops.yaml
@@ -17,7 +17,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Copy Repository Contents
-        uses: actions/checkout@v4
+        uses: actions/checkout@master
 
       - name: create deployment
         run: |

diff --git a/README.md b/README.md
@@ -166,7 +166,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: cache binder build on mybinder.org
-      uses: jupyterhub/repo2docker-action@main
+      uses: jupyterhub/repo2docker-action@master
       with:
         NO_PUSH: true
         MYBINDERORG_TAG: ${{ github.event.ref }} # This builds the container on mybinder.org with the branch that was pushed on.
@@ -189,7 +189,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: cache binder build on mybinder.org
-      uses: jupyterhub/repo2docker-action@main
+      uses: jupyterhub/repo2docker-action@master
       with:
         NO_PUSH: true
         MYBINDERORG_TAG: ${{ github.event.pull_request.head.ref }}
@@ -230,7 +230,7 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
 
     - name: update jupyter dependencies with repo2docker
-      uses: jupyterhub/repo2docker-action@main
+      uses: jupyterhub/repo2docker-action@master
       with:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@@ -255,7 +255,7 @@ jobs:
       uses: actions/checkout@main
 
     - name: update jupyter dependencies with repo2docker
-      uses: jupyterhub/repo2docker-action@main
+      uses: jupyterhub/repo2docker-action@master
       with:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@@ -300,7 +300,7 @@ to any particular cloud vendor.
          uses: actions/checkout@main
 
        - name: update jupyter dependencies with repo2docker
-         uses: jupyterhub/repo2docker-action@main
+         uses: jupyterhub/repo2docker-action@master
          with: # make sure username & password/token matches your registry
            DOCKER_USERNAME: ${{ secrets.QUAY_USERNAME }}
            DOCKER_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
@@ -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@main
+         uses: jupyterhub/repo2docker-action@master
          with:
            DOCKER_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
            IMAGE_NAME: "<aws-username>/<repository-name>"
@@ -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@main
+         uses: jupyterhub/repo2docker-action@master
          with:
            DOCKER_REGISTRY: gcr.io
            IMAGE_NAME: ${{ secrets.GCP_PROJECT_ID }}/<repository-name>
@@ -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@main
+         uses: jupyterhub/repo2docker-action@master
          with:
            DOCKER_REGISTRY: <location>-docker.pkg.dev
            IMAGE_NAME: ${{ secrets.GCP_PROJECT_ID }}/<repository-name>
@@ -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@main
+         uses: jupyterhub/repo2docker-action@master
          with:
            DOCKER_USERNAME: ${{ secrets.ACR_USERNAME }}
            DOCKER_PASSWORD: ${{ secrets.ACR_PASSWORD }}
@@ -506,7 +506,7 @@ jobs:
       uses: actions/checkout@main
 
     - name: update jupyter dependencies with repo2docker
-      uses: jupyterhub/repo2docker-action@main
+      uses: jupyterhub/repo2docker-action@master
       with: # make sure username & password/token matches your registry
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@@ -530,7 +530,7 @@ jobs:
     #       docker registry before running the repo2docker-action
 
     - name: update jupyter dependencies with repo2docker
-      uses: jupyterhub/repo2docker-action@main
+      uses: jupyterhub/repo2docker-action@master
       with:
         DOCKER_REGISTRY: your-registry.example.org
         IMAGE_NAME: your-image-name
@@ -552,7 +552,7 @@ jobs:
       uses: actions/checkout@main
 
     - name: update jupyter dependencies with repo2docker
-      uses: jupyterhub/repo2docker-action@main
+      uses: jupyterhub/repo2docker-action@master
       with:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@@ -576,7 +576,7 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
 
     - name: test build
-      uses: jupyterhub/repo2docker-action@main
+      uses: jupyterhub/repo2docker-action@master
       with:
         NO_PUSH: 'true'
         IMAGE_NAME: "hamelsmu/repo2docker-test"

diff --git a/action_files/create_deployment.py b/action_files/create_deployment.py
@@ -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 main into the current branch
+# if you get a 202 this means that it needs to merge master 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}"

diff --git a/trigger_binder.sh b/trigger_binder.sh
@@ -1,6 +1,6 @@
 
 #!/usr/bin/env bash
-# from https://github.com/scikit-hep/pyhf/blob/main/binder/trigger_binder.sh
+# from https://github.com/scikit-hep/pyhf/blob/master/binder/trigger_binder.sh
 
 function trigger_binder() {
     local URL="${1}"