Skip to content

Commit

Permalink
Update references to master branch to main [API-414]
Browse files Browse the repository at this point in the history
  • Loading branch information
nikhiltri committed Jan 29, 2025
1 parent 24ab4ad commit 3e981dc
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
push:
branches:
- develop
- master
- main
pull_request:
branches:
- develop
- master
- main

jobs:
build:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/vuepress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: VuePress
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
build:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/Dump/DumpUpload.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion app/Transformers/Outbound/Collections/ArtworkManifest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion database/dumps/local/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions deploy-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ git add -A
git commit -m 'deploy'

# if you are deploying to https://<USERNAME>.github.io
# git push -f git@github.com:<USERNAME>/<USERNAME>.github.io.git master
# git push -f git@github.com:<USERNAME>/<USERNAME>.github.io.git main

# if you are deploying to https://<USERNAME>.github.io/<REPO>
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 -
cd -

0 comments on commit 3e981dc

Please sign in to comment.