Skip to content

Commit

Permalink
refactor: more ci changes
Browse files Browse the repository at this point in the history
  • Loading branch information
TurtIeSocks committed Feb 5, 2024
1 parent 4fd4bb6 commit 9b08c5b
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 51 deletions.
15 changes: 4 additions & 11 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Config
on:
push:
branches:
- main
- develop
workflow_run:
workflows: [Lint]
types: [completed]
branches: [main, develop]

env:
REGISTRY: ghcr.io
Expand All @@ -14,13 +14,6 @@ jobs:
name: Config Sync
runs-on: ubuntu-latest
steps:
- name: Wait for other CI
uses: lewagon/[email protected]
with:
ref: ${{ github.ref }}
check-name: 'Lint Check'
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 10
- name: Checkout code
id: checkout-code
uses: actions/checkout@v3
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: Docker
on: [push]
on:
workflow_run:
workflows: [Config, Locales]
types: [completed]
release:
types: [prereleased, released]

env:
REGISTRY: ghcr.io
Expand All @@ -9,13 +14,6 @@ jobs:
Docker:
runs-on: ubuntu-latest
steps:
- name: Wait for other CI
uses: lewagon/[email protected]
with:
ref: ${{ github.ref }}
check-name: 'GitHub Release'
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 10
- uses: actions/checkout@v3
- name: Set .gitsha
if: github.event_name == 'push'
Expand Down
14 changes: 4 additions & 10 deletions .github/workflows/locales.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Locales
on:
push:
branches:
- main
workflow_run:
workflows: [Config]
types: [completed]
branches: [main]

env:
REGISTRY: ghcr.io
Expand All @@ -13,13 +14,6 @@ jobs:
name: Locales Sync
runs-on: ubuntu-latest
steps:
- name: Wait for other CI
uses: lewagon/[email protected]
with:
ref: ${{ github.ref }}
check-name: 'Config Sync'
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 10
- name: Checkout code
id: checkout-code
uses: actions/checkout@v3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
name: Release

on:
pull_request:
push:
branches:
- main
- develop
on: workflow_call

permissions: write-all

Expand All @@ -14,13 +8,6 @@ jobs:
name: GitHub Release
runs-on: ubuntu-latest
steps:
- name: Wait for other CI
uses: lewagon/[email protected]
with:
ref: ${{ github.ref }}
check-name: 'Locales Sync'
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 10
- name: Checkout
uses: actions/checkout@v3
with:
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/release-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Release Develop

on:
workflow_run:
workflows: [Config]
types: [completed]
branches: [develop]

jobs:
releaseDev:
name: Release Develop
runs-on: ubuntu-latest
steps:
- name: Run Release Base
uses: WatWowMap/ReactMap/.github/workflows/release-base.yml@develop
15 changes: 15 additions & 0 deletions .github/workflows/release-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Release Main

on:
workflow_run:
workflows: [Locales]
types: [completed]
branches: [main]

jobs:
releaseDev:
name: Release Main
runs-on: ubuntu-latest
steps:
- name: Run Release Base
uses: WatWowMap/ReactMap/.github/workflows/release-base.yml@main
12 changes: 4 additions & 8 deletions .github/workflows/sentry.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
name: Sentry
on: [release]
on:
release:
types: [prereleased, released]

jobs:
sentry:
name: Sentry
runs-on: ubuntu-latest
steps:
- name: Wait for other CI
uses: lewagon/[email protected]
with:
ref: ${{ github.ref }}
check-name: 'Lint Check'
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 10
- name: Checkout Code
id: checkout-code
uses: actions/checkout@v3
Expand Down

0 comments on commit 9b08c5b

Please sign in to comment.