diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 3f8cd44a4..3063a110a 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -4,11 +4,11 @@ on: push: branches: - develop - - master + - main pull_request: branches: - develop - - master + - main jobs: build: diff --git a/.github/workflows/vuepress.yml b/.github/workflows/vuepress.yml index cb4edf1f9..07811b3cc 100644 --- a/.github/workflows/vuepress.yml +++ b/.github/workflows/vuepress.yml @@ -3,10 +3,10 @@ name: VuePress on: push: branches: - - master + - main pull_request: branches: - - master + - main jobs: build: @@ -33,7 +33,7 @@ jobs: - name: Deploy uses: peaceiris/actions-gh-pages@v3 - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./docs/.vuepress/dist diff --git a/README.md b/README.md index 2edb68fdd..d2c4e4df9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Art Institute of Chicago](https://raw.githubusercontent.com/Art-Institute-of-Chicago/template/master/aic-logo.gif) +![Art Institute of Chicago](https://raw.githubusercontent.com/Art-Institute-of-Chicago/template/main/aic-logo.gif) # Data Aggregator > A central location of data collected from several different systems and offered up through an API diff --git a/app/Console/Commands/Dump/DumpUpload.php b/app/Console/Commands/Dump/DumpUpload.php index 1f161a468..8db56f1da 100644 --- a/app/Console/Commands/Dump/DumpUpload.php +++ b/app/Console/Commands/Dump/DumpUpload.php @@ -111,7 +111,7 @@ public function handle() config('aic.dump.repo_name') . ' <' . config('aic.dump.repo_email') . '>' ); - $this->shell->passthru('git -C %s push --set-upstream origin master %s', $repoPath, '--force'); + $this->shell->passthru('git -C %s push --set-upstream origin main %s', $repoPath, '--force'); // Now, copy full dataset (takes about 1 min 45 sec) $this->shell->passthru('rsync -r %s/ %s', $srcPath . '/json', $repoPath . '/json'); diff --git a/app/Transformers/Outbound/Collections/ArtworkManifest.php b/app/Transformers/Outbound/Collections/ArtworkManifest.php index 29a73ab8a..788626ad0 100644 --- a/app/Transformers/Outbound/Collections/ArtworkManifest.php +++ b/app/Transformers/Outbound/Collections/ArtworkManifest.php @@ -53,7 +53,7 @@ public function transform(Artwork $model) ], ], 'attribution' => ($model->copyright_notice ? $model->copyright_notice . ' ' : '') . 'Digital image courtesy of the Art Institute of Chicago.', - 'logo' => 'https://raw.githubusercontent.com/Art-Institute-of-Chicago/template/master/aic-logo.gif', + 'logo' => 'https://raw.githubusercontent.com/Art-Institute-of-Chicago/template/main/aic-logo.gif', 'within' => config('aic.config_documentation.website_url') . '/collection', 'rendering' => [ '@id' => config('aic.config_documentation.website_url') . '/artworks/' . $model->id, diff --git a/database/dumps/local/README.md b/database/dumps/local/README.md index d6064e166..73073ef92 100644 --- a/database/dumps/local/README.md +++ b/database/dumps/local/README.md @@ -1,4 +1,4 @@ -![Art Institute of Chicago](https://raw.githubusercontent.com/Art-Institute-of-Chicago/template/master/aic-logo.gif) +![Art Institute of Chicago](https://raw.githubusercontent.com/Art-Institute-of-Chicago/template/main/aic-logo.gif) # Public API data diff --git a/deploy-docs.sh b/deploy-docs.sh index 83e289985..2fd9607e5 100755 --- a/deploy-docs.sh +++ b/deploy-docs.sh @@ -17,9 +17,9 @@ git add -A git commit -m 'deploy' # if you are deploying to https://.github.io -# git push -f git@github.com:/.github.io.git master +# git push -f git@github.com:/.github.io.git main # if you are deploying to https://.github.io/ -git push -f git@github.com:art-institute-of-chicago/data-aggregator.git master:gh-pages +git push -f git@github.com:art-institute-of-chicago/data-aggregator.git main:gh-pages -cd - \ No newline at end of file +cd -