Skip to content
This repository was archived by the owner on May 6, 2023. It is now read-only.

Commit

Permalink
ci: Changing default branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
ViBiOh committed Feb 3, 2021
1 parent 50b1d76 commit 0ac6181
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/branch_clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
BASE: origin/${{ github.base_ref }}
HEAD: origin/${{ github.head_ref }}
run: |
curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/master/bootstrap" | bash -s "git_branch_clean"
curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s "git_branch_clean"
scripts/git_branch_clean "${BASE}" "${HEAD}"
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ name: Build
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

env:
SCRIPTS_NO_INTERACTIVE: "true"
Expand Down Expand Up @@ -49,13 +49,13 @@ jobs:
go-version: "^1.15"
- name: Build
run: |
curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/master/bootstrap" | bash -s "release"
curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s "release"
./scripts/release build
DOCKER_IMAGE="${{ secrets.DOCKER_USER }}/$(make name)" IMAGE_VERSION="$(make version)" ./scripts/release docker
publish:
name: Publish
if: github.event_name == 'push' && github.ref == 'refs/heads/master' && !contains(toJSON(github.event.commits.*.message), '[skip-ci]')
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && !contains(toJSON(github.event.commits.*.message), '[skip-ci]')
runs-on: ubuntu-latest
needs: package
steps:
Expand All @@ -65,7 +65,7 @@ jobs:
DOCKER_USER: ${{ secrets.DOCKER_USER }}
DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
run: |
curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/master/bootstrap" | bash -s "docker_promote"
curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s "docker_promote"
scripts/docker_promote "${{ secrets.DOCKER_USER }}/$(make name)" "$(make version)"
- name: GoReport
run: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ name: "CodeQL"

on:
push:
branches: [master]
branches:
- main
pull_request:
branches: [master]
branches:
- main
schedule:
- cron: "0 0 * * 6"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/herodote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Herodote
on:
push:
branches:
- master
- main
jobs:
build:
name: Feed
Expand All @@ -17,7 +17,7 @@ jobs:

- name: Push history
run: |
curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/herodote/master/herodote.sh" | bash
curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/herodote/main/herodote.sh" | bash
env:
HERODOTE_API: https://herodote.vibioh.fr
HERODOTE_SECRET: ${{ secrets.HERODOTE_SECRET }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ app: init dev
## init: Bootstrap your application. e.g. fetch some data files, make some API calls, request user input etc...
.PHONY: init
init:
@curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/master/bootstrap" | bash -s "git_hooks" "coverage" "release"
@curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s "git_hooks" "coverage" "release"
go get github.com/kisielk/errcheck
go get golang.org/x/lint/golint
go get golang.org/x/tools/cmd/goimports
Expand Down

0 comments on commit 0ac6181

Please sign in to comment.