ci: move src -> scripts, deno.json to repo root

catppuccin · Nov 18, 2023 · 79e26bc · 79e26bc
1 parent f977c5a
commit 79e26bc
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 20 deletions.
diff --git a/.github/workflows/deno-check.yml b/.github/workflows/deno-check.yml
@@ -27,11 +27,10 @@ jobs:
       - name: Cache Deno dependencies
         uses: actions/cache@v3
         with:
-          key: ${{ hashFiles('src/deno.lock') }}
+          key: ${{ hashFiles('./deno.lock') }}
           path: ${{ env.DENO_DIR }}
 
       - name: Check
-        working-directory: src
         run: |
           deno lint
           deno check **/*.ts

diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     paths:
-      - "src/**/*"
+      - "scripts/**/*"
 
 env:
   DENO_DIR: deno_cache
@@ -38,11 +38,10 @@ jobs:
       - name: Cache Deno dependencies
         uses: actions/cache@v3
         with:
-          key: ${{ hashFiles('src/deno.lock') }}
+          key: ${{ hashFiles('./deno.lock') }}
           path: ${{ env.DENO_DIR }}
 
       - name: Generate health files
-        working-directory: ./src
         run: deno task generate
 
       - name: Push changes

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -25,9 +25,8 @@ jobs:
       - name: Cache Deno dependencies
         uses: actions/cache@v3
         with:
-          key: ${{ hashFiles('src/deno.lock') }}
+          key: ${{ hashFiles('./deno.lock') }}
           path: ${{ env.DENO_DIR }}
 
       - name: Run Lint
-        working-directory: src
         run: deno task lint
diff --git a/.github/workflows/maintainers.yml b/.github/workflows/maintainers.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     paths:
-      - "src/userstyles.yml"
+      - "scripts/userstyles.yml"
 
 env:
   DENO_DIR: deno_cache
@@ -27,12 +27,11 @@ jobs:
       - name: Cache Deno dependencies
         uses: actions/cache@v3
         with:
-          key: ${{ hashFiles('src/deno.lock') }}
+          key: ${{ hashFiles('./deno.lock') }}
           path: ${{ env.DENO_DIR }}
 
       - name: Sync maintainers
         if: ${{ github.repository == 'catppuccin/userstyles' && github.ref == 'refs/heads/main' }}
-        working-directory: ./src
         run: deno task sync-maintainers
         env:
           GITHUB_TOKEN: ${{ secrets.USERSTYLES_TOKEN }}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,7 +4,6 @@
   },
 
   "deno.enable": true,
-  "deno.config": "./src/deno.json",
 
   "[less]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"

diff --git a/src/deno.json → deno.json b/src/deno.json → deno.json
@@ -1,6 +1,6 @@
 {
   "imports": {
-    "@/": "./",
+    "@/": "./scripts/",
     "std/": "https://deno.land/[email protected]/",
     "catppuccin-repo/": "https://raw.githubusercontent.com/catppuccin/catppuccin/91d6b5433730103c504dcf43583b594e418ee7c1/",
     "@actions/core": "npm:@actions/[email protected]",
@@ -11,10 +11,10 @@
     "less": "npm:[email protected]"
   },
   "tasks": {
-    "generate": "./generate/main.ts",
-    "lint": "./lint/main.ts",
-    "lint:fix": "./lint/main.ts --fix",
-    "sync-maintainers": "./sync-maintainers/main.ts",
-    "update-types": "deno run -A 'npm:json-schema-to-typescript' ./userstyles.schema.json types/userstyles.d.ts"
+    "ci:generate": "deno run -A ./scripts/generate/main.ts",
+    "ci:sync-maintainers": "deno run -A ./scripts/sync-maintainers/main.ts",
+    "lint": "deno run -A ./scripts/lint/main.ts",
+    "lint:fix": "deno task lint --fix",
+    "update-types": "deno run -A 'npm:json-schema-to-typescript' ./scripts/userstyles.schema.json ./scripts/types/userstyles.d.ts"
   }
 }
diff --git a/src/deno.lock → deno.lock b/src/deno.lock → deno.lock
diff --git a/src/deps.ts → scripts/deps.ts b/src/deps.ts → scripts/deps.ts
diff --git a/src/generate/main.ts → scripts/generate/main.ts b/src/generate/main.ts → scripts/generate/main.ts
@@ -41,7 +41,7 @@ const validate = ajv.compile<Metadata>(schema);
 const validatePorts = ajv.compile<PortMetadata>(portsSchema);
 
 const userstylesYaml = Deno.readTextFileSync(
-  path.join(REPO_ROOT, "src/userstyles.yml"),
+  path.join(REPO_ROOT, "scripts/userstyles.yml"),
 );
 const userstylesData = parseYaml(userstylesYaml);
 if (!validate(userstylesData)) {

diff --git a/src/generate/templates/userstyle-issue.yml → ...ts/generate/templates/userstyle-issue.yml b/src/generate/templates/userstyle-issue.yml → ...ts/generate/templates/userstyle-issue.yml
diff --git a/src/generate/templates/userstyle.md → scripts/generate/templates/userstyle.md b/src/generate/templates/userstyle.md → scripts/generate/templates/userstyle.md
diff --git a/src/lint/file-checker.ts → scripts/lint/file-checker.ts b/src/lint/file-checker.ts → scripts/lint/file-checker.ts
diff --git a/src/lint/logger.ts → scripts/lint/logger.ts b/src/lint/logger.ts → scripts/lint/logger.ts
diff --git a/src/lint/main.ts → scripts/lint/main.ts b/src/lint/main.ts → scripts/lint/main.ts
diff --git a/src/lint/metadata.ts → scripts/lint/metadata.ts b/src/lint/metadata.ts → scripts/lint/metadata.ts
diff --git a/src/lint/stylelint.ts → scripts/lint/stylelint.ts b/src/lint/stylelint.ts → scripts/lint/stylelint.ts
diff --git a/src/sync-maintainers/main.ts → scripts/sync-maintainers/main.ts b/src/sync-maintainers/main.ts → scripts/sync-maintainers/main.ts
@@ -16,7 +16,7 @@ const ajv = new Ajv.default();
 const validate = ajv.compile<UserstylesSchema>(schema);
 
 const userstylesYaml = Deno.readTextFileSync(
-  path.join(REPO_ROOT, "src/userstyles.yml"),
+  path.join(REPO_ROOT, "scripts/userstyles.yml"),
 );
 const userstylesData = parseYaml(userstylesYaml);
 if (!validate(userstylesData)) {

diff --git a/src/types.d.ts → scripts/types.d.ts b/src/types.d.ts → scripts/types.d.ts
diff --git a/src/types/userstyles.d.ts → scripts/types/userstyles.d.ts b/src/types/userstyles.d.ts → scripts/types/userstyles.d.ts
diff --git a/src/userstyles.schema.json → scripts/userstyles.schema.json b/src/userstyles.schema.json → scripts/userstyles.schema.json
diff --git a/src/userstyles.yml → scripts/userstyles.yml b/src/userstyles.yml → scripts/userstyles.yml
@@ -479,4 +479,4 @@ userstyles:
           answer: "It's available in case you have an OLED display. If you have one, you might want to enable this."
       current-maintainers: [*isabelroses]
       past-maintainers: [*elkrien]
-# yaml-language-server: $schema=https://raw.githubusercontent.com/catppuccin/userstyles/main/src/userstyles.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/catppuccin/userstyles/main/scripts/userstyles.schema.json