Skip to content

Commit

Permalink
fix: simply ci
Browse files Browse the repository at this point in the history
  • Loading branch information
TurtIeSocks committed Feb 6, 2024
1 parent 49cb4ec commit ff0f718
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 69 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
name: Config
on:
workflow_run:
workflows: [Lint]
types: [completed]
branches: [main, develop]

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
on: workflow_call

jobs:
config:
if: ${{ github.ref_name == 'main' || github.ref_name == 'develop'}}
name: Config Sync
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -40,5 +33,5 @@ jobs:
if: ${{ env.changes_exist == 'true' }}
run: |
git add --all
git commit --message "chore: Sync CI/CD Config Items"
git commit --message "chore: Sync Config [skip ci]"
git push
8 changes: 0 additions & 8 deletions .github/workflows/docker-pr.yml

This file was deleted.

8 changes: 0 additions & 8 deletions .github/workflows/docker-release.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
name: Docker
on:
workflow_run:
workflows: [Config, Locales]
types: [completed]
release:
types: [prereleased, released]
on: workflow_call

env:
REGISTRY: ghcr.io
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Lint
on: [push]
on: [push, pull_request]

jobs:
lint:
Expand All @@ -12,9 +12,9 @@ jobs:
with:
fetch-depth: 2
- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: 'yarn'

- name: Install Dependencies
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/locales.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
name: Locales
on:
workflow_run:
workflows: [Lint]
types: [completed]
branches: [main]

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
on: workflow_call

permissions: write-all

jobs:
locales:
if: ${{ github.ref_name == 'main' }}
name: Locales Sync
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -44,10 +37,9 @@ jobs:
if: ${{ env.changes_exist == 'true' }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HUSKY: 0
run: |
git add --all
git commit --message "chore: sync locales"
git commit --message "chore: sync locales [skip ci]"
git push
git checkout develop
git merge main
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Main CI
on: [push, pull_request]

jobs:
config:
uses: ./.github/workflows/config.yml
locales:
uses: ./.github/workflows/locales.yml
release:
uses: ./.github/workflows/release.yml
docker:
uses: ./.github/workflows/docker.yml
11 changes: 0 additions & 11 deletions .github/workflows/release-develop.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .github/workflows/release-main.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ permissions: write-all

jobs:
release:
if: ${{ github.ref_name == 'main' || github.ref_name == 'develop'}}
name: GitHub Release
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sentry.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Sentry
on:
release:
types: [prereleased, released]
types: [published]

jobs:
sentry:
Expand Down

0 comments on commit ff0f718

Please sign in to comment.