Skip to content

Commit

Permalink
fix: another release
Browse files Browse the repository at this point in the history
  • Loading branch information
antoinebigard committed May 4, 2023
1 parent 574c625 commit 9ac3c03
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 18 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
- run: make ci

- run: make coverage
# - run: make coverage

- name: Upload coverage report to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
# - name: Upload coverage report to Codecov
# uses: codecov/codecov-action@v3
# with:
# token: ${{ secrets.CODECOV_TOKEN }}
18 changes: 9 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}

jobs:
# tests:
# if: "!startsWith(github.event.head_commit.message, 'chore')"
# uses: "./.github/workflows/ci.yml"
# secrets:
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
tests:
if: "!startsWith(github.event.head_commit.message, 'chore')"
uses: "./.github/workflows/ci.yml"
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

release:
if: "!startsWith(github.event.head_commit.message, 'chore')"
# needs: ["tests"]
needs: ["tests"]
runs-on: ubuntu-latest
steps:
- name: Checkout project
Expand All @@ -42,16 +42,16 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GH_FG_TOKEN }}

- name: Run yarn Install
run: yarn &> /dev/null
# - name: Run yarn Install
# run: yarn &> /dev/null
# - name: Install release dependencies
# run: yarn add @commitlint/cli @commitlint/config-conventional @semantic-release/changelog @semantic-release/exec @semantic-release/git semantic-release semantic-release-slack-bot

- run: git fetch
- run: git checkout main

- name: bump and release
run: npx semantic-release
run: yarn app:release
env:
GH_TOKEN: ${{ secrets.GH_FG_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GH_FG_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
install:
yarn install
yarn

start:
docker-compose up --build --force-recreate
Expand Down
5 changes: 2 additions & 3 deletions git-hooks/prepare-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,5 @@ sed -i "s/default:.*/default: $next_version/" ".github/workflows/_deploy.yml"
echo "Bump app version in _deploy.yml : $next_version"

# ## Concurrency mode
# git fetch
# git checkout main
# git reset --hard origin/main
git fetch
git checkout main

0 comments on commit 9ac3c03

Please sign in to comment.