Skip to content

Commit

Permalink
Develop -> dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Koenkk committed Jul 29, 2024
1 parent f89e65d commit 9fa1291
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 18 deletions.
18 changes: 3 additions & 15 deletions .github/workflows/build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ jobs:
run: pnpm install --frozen-lockfile

- name: Lint
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop'
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
run: pnpm run pretty:check

- name: Build 🛠
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop'
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
run: pnpm run build

- name: Run tests 🩺
run: pnpm run test

- name: Add build.txt 🗓
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop'
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
run: |
git log --pretty=format:'%h' -n 1 > dist/build.txt
echo >> dist/build.txt
Expand All @@ -52,15 +52,3 @@ jobs:
folder: dist # The folder the action should deploy.
single-commit: true
clean: true
# clean-exclude: |
# develop

# - name: Deploy to /develop 🚀
# if: github.ref == 'refs/heads/develop'
# uses: JamesIves/[email protected]
# with:
# branch: gh-pages
# folder: dist
# target-folder: develop
# single-commit: true
# clean: true
6 changes: 3 additions & 3 deletions .github/workflows/merge_master_to_dev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Merge master to develop
name: Merge master to dev

on:
push:
Expand All @@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Merge master -> develop
- name: Merge master -> dev
uses: devmasx/merge-branch@master
with:
type: now
head_to_merge: master
target_branch: develop
target_branch: dev
github_token: ${{ github.token }}

0 comments on commit 9fa1291

Please sign in to comment.