Skip to content

Commit

Permalink
update branch template CI
Browse files Browse the repository at this point in the history
  • Loading branch information
hiento09 committed Jan 16, 2024
1 parent 9491241 commit d5b9387
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/jan-electron-build-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ on:

jobs:
delete-cloudflare-r2-folder:
uses: ./.github/workflows/templates/delete-cloudflare-r2-folder.yml@main
uses: ./.github/workflows/templates/delete-cloudflare-r2-folder.yml@feature/update-ci-follow-gitflow
with:
environment: production

# Job create Update app version based on latest release tag with build number and save to output
get-update-version:
uses: ./.github/workflows/templates/get-update-version.yml@main
uses: ./.github/workflows/templates/get-update-version.yml@feature/update-ci-follow-gitflow
with:
environment: production

build-macos:
uses: ./.github/workflows/templates/build-macos.yml@main
uses: ./.github/workflows/templates/build-macos.yml@feature/update-ci-follow-gitflow
with:
environment: production
ref: refs/heads/dev
Expand All @@ -28,7 +28,7 @@ jobs:
upload_cloudflare_r2: true

build-windows-x64:
uses: ./.github/workflows/templates/build-windows-x64.yml@main
uses: ./.github/workflows/templates/build-windows-x64.yml@feature/update-ci-follow-gitflow
with:
environment: production
ref: refs/heads/dev
Expand All @@ -38,7 +38,7 @@ jobs:


build-linux-x64:
uses: ./.github/workflows/templates/build-linux-x64.yml@main
uses: ./.github/workflows/templates/build-linux-x64.yml@feature/update-ci-follow-gitflow
with:
environment: production
ref: refs/heads/dev
Expand All @@ -49,7 +49,7 @@ jobs:
noti-discord-nightly-and-update-url-readme:
needs: [build-macos, build-windows-x64, build-linux-x64, delete-cloudflare-r2-folder, get-update-version]
if: github.event_name == 'schedule'
uses: ./.github/workflows/templates/noti-discord-and-update-url-readme.yml@main
uses: ./.github/workflows/templates/noti-discord-and-update-url-readme.yml@feature/update-ci-follow-gitflow
with:
ref: refs/heads/dev
build_reason: Nightly
Expand All @@ -58,7 +58,7 @@ jobs:
noti-discord-manual-and-update-url-readme:
needs: [build-macos, build-windows-x64, build-linux-x64, delete-cloudflare-r2-folder, get-update-version]
if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/dev'
uses: ./.github/workflows/templates/noti-discord-and-update-url-readme.yml@main
uses: ./.github/workflows/templates/noti-discord-and-update-url-readme.yml@feature/update-ci-follow-gitflow
with:
ref: refs/heads/dev
build_reason: Manual
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/jan-electron-build-pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ on:

jobs:
delete-cloudflare-r2-folder:
uses: ./.github/workflows/templates/delete-cloudflare-r2-folder.yml@main
uses: ./.github/workflows/templates/delete-cloudflare-r2-folder.yml@feature/update-ci-follow-gitflow
with:
environment: production

# Job create Update app version based on latest release tag with build number and save to output
get-update-version:
uses: ./.github/workflows/templates/get-update-version.yml@main
uses: ./.github/workflows/templates/get-update-version.yml@feature/update-ci-follow-gitflow
with:
environment: production

build-macos:
uses: ./.github/workflows/templates/build-macos.yml@main
uses: ./.github/workflows/templates/build-macos.yml@feature/update-ci-follow-gitflow
with:
environment: production
ref: refs/heads/main
Expand All @@ -30,7 +30,7 @@ jobs:
upload_cloudflare_r2: true

build-windows-x64:
uses: ./.github/workflows/templates/build-windows-x64.yml@main
uses: ./.github/workflows/templates/build-windows-x64.yml@feature/update-ci-follow-gitflow
with:
environment: production
ref: refs/heads/main
Expand All @@ -40,7 +40,7 @@ jobs:


build-linux-x64:
uses: ./.github/workflows/templates/build-linux-x64.yml@main
uses: ./.github/workflows/templates/build-linux-x64.yml@feature/update-ci-follow-gitflow
with:
environment: production
ref: refs/heads/main
Expand All @@ -51,7 +51,7 @@ jobs:
noti-discord-nightly-and-update-url-readme:
needs: [build-macos, build-windows-x64, build-linux-x64, delete-cloudflare-r2-folder, get-update-version]
if: github.event_name == 'push'
uses: ./.github/workflows/templates/noti-discord-and-update-url-readme.yml@main
uses: ./.github/workflows/templates/noti-discord-and-update-url-readme.yml@feature/update-ci-follow-gitflow
with:
ref: refs/heads/main
build_reason: Nightly
Expand All @@ -60,7 +60,7 @@ jobs:
noti-discord-manual-and-update-url-readme:
needs: [build-macos, build-windows-x64, build-linux-x64, delete-cloudflare-r2-folder, get-update-version]
if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main'
uses: ./.github/workflows/templates/noti-discord-and-update-url-readme.yml@main
uses: ./.github/workflows/templates/noti-discord-and-update-url-readme.yml@feature/update-ci-follow-gitflow
with:
ref: refs/heads/main
build_reason: Manual
Expand Down

0 comments on commit d5b9387

Please sign in to comment.