chore: merge aqua config files in one directory

aquaproj · Mar 18, 2023 · 1a92aa6 · 1a92aa6
1 parent 6af5583
commit 1a92aa6
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 14 deletions.
diff --git a/.envrc b/.envrc
@@ -1 +1 @@
-export AQUA_POLICY_CONFIG=$PWD/aqua-policy.yaml:$AQUA_POLICY_CONFIG
+export AQUA_POLICY_CONFIG=$PWD/aqua/policy.yaml:$AQUA_POLICY_CONFIG
diff --git a/.github/workflows/actionlint.yaml b/.github/workflows/actionlint.yaml
@@ -5,14 +5,14 @@ on:
   pull_request:
     paths:
       - .github/workflows/*.yaml
-      - aqua/actionlint.yaml
-      - aqua/reviewdog.yaml
+      - aqua/imports/actionlint.yaml
+      - aqua/imports/reviewdog.yaml
 jobs:
   actionlint:
     uses: suzuki-shunsuke/actionlint-workflow/.github/workflows/actionlint.yaml@6196583ab88cd36f36f7260fca4e8e4b2c4c9b66 # v0.4.1
     with:
       aqua_version: v1.36.1
-      aqua_policy_config: aqua-policy.yaml
+      aqua_policy_config: aqua/policy.yaml
     permissions:
       pull-requests: write
       contents: read
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,7 +10,7 @@ jobs:
     with:
       homebrew: true
       go-version: 1.20.1
-      aqua_policy_config: aqua-policy.yaml
+      aqua_policy_config: aqua/policy.yaml
       aqua_version: v1.36.1
     secrets:
       gh_app_id: ${{secrets.APP_ID}}

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -4,7 +4,7 @@ name: test
 on: pull_request
 
 env:
-  AQUA_POLICY_CONFIG: ${{ github.workspace }}/aqua-policy.yaml
+  AQUA_POLICY_CONFIG: ${{ github.workspace }}/aqua/policy.yaml
   AQUA_LOG_COLOR: always
 
 permissions: {}
@@ -24,15 +24,15 @@ jobs:
         with:
           filters: |
             update-aqua-checksums:
-              - aqua.yaml
-              - aqua/*.yaml
-              - aqua-checksums.json
+              - aqua/aqua.yaml
+              - aqua/imports/*.yaml
+              - aqua/aqua-checksums.json
               - .github/workflows/test.yaml
             renovate-config-validator:
               - renovate.json5
             ghalint:
               - .github/workflows/*.yaml
-              - aqua/ghalint.yaml
+              - aqua/imports/ghalint.yaml
             go-mod-tidy:
               - go.mod
               - go.sum
@@ -173,7 +173,6 @@ jobs:
     env:
       GITHUB_TOKEN: ${{github.token}}
       AQUA_LOG_LEVEL: debug
-      AQUA_POLICY_CONFIG: ${{ github.workspace }}/aqua-policy.yaml
       AQUA_GLOBAL_CONFIG: ${{ github.workspace }}/tests/main/aqua-global.yaml:${{ github.workspace }}/tests/main/aqua-global-2.yaml
     steps:
       - uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0

diff --git a/.github/workflows/windows-test.yaml b/.github/workflows/windows-test.yaml
@@ -3,7 +3,7 @@ name: Integration Test on Windows
 on: workflow_dispatch
 
 env:
-  AQUA_POLICY_CONFIG: ${{ github.workspace }}/aqua-policy.yaml
+  AQUA_POLICY_CONFIG: ${{ github.workspace }}/aqua/policy.yaml
   AQUA_GLOBAL_CONFIG: ${{ github.workspace }}/tests/main/aqua-global.yaml:${{ github.workspace }}/tests/main/aqua-global-2.yaml
   AQUA_LOG_COLOR: always
   AQUA_LOG_LEVEL: debug

diff --git a/aqua-checksums.json → aqua/aqua-checksums.json b/aqua-checksums.json → aqua/aqua-checksums.json
diff --git a/aqua.yaml → aqua/aqua.yaml b/aqua.yaml → aqua/aqua.yaml
@@ -8,4 +8,4 @@ registries:
   - type: standard
     ref: v3.145.1 # renovate: depName=aquaproj/aqua-registry
 packages:
-  - import: aqua/*.yaml
+  - import: imports/*.yaml
diff --git a/aqua/actionlint.yaml → aqua/imports/actionlint.yaml b/aqua/actionlint.yaml → aqua/imports/actionlint.yaml
diff --git a/aqua/cmdx.yaml → aqua/imports/cmdx.yaml b/aqua/cmdx.yaml → aqua/imports/cmdx.yaml
diff --git a/aqua/cosign.yaml → aqua/imports/cosign.yaml b/aqua/cosign.yaml → aqua/imports/cosign.yaml
diff --git a/aqua/ghalint.yaml → aqua/imports/ghalint.yaml b/aqua/ghalint.yaml → aqua/imports/ghalint.yaml
diff --git a/aqua/ghcp.yaml → aqua/imports/ghcp.yaml b/aqua/ghcp.yaml → aqua/imports/ghcp.yaml
diff --git a/aqua/golangci-lint.yaml → aqua/imports/golangci-lint.yaml b/aqua/golangci-lint.yaml → aqua/imports/golangci-lint.yaml
diff --git a/aqua/goreleser.yaml → aqua/imports/goreleser.yaml b/aqua/goreleser.yaml → aqua/imports/goreleser.yaml
diff --git a/aqua/reviewdog.yaml → aqua/imports/reviewdog.yaml b/aqua/reviewdog.yaml → aqua/imports/reviewdog.yaml
diff --git a/aqua-policy.yaml → aqua/policy.yaml b/aqua-policy.yaml → aqua/policy.yaml
diff --git a/renovate.json5 b/renovate.json5
@@ -6,7 +6,7 @@
     "github>suzuki-shunsuke/renovate-config:nolimit#2.0.0",
     "github>aquaproj/aqua-renovate-config:file#1.5.2(tests/aqua.*\\.yaml)",
     "github>suzuki-shunsuke/renovate-config:action-go-version#2.0.0",
-    "github>aquaproj/aqua-renovate-config:file#1.5.2(aqua/.*\\.ya?ml)",
+    "github>aquaproj/aqua-renovate-config:file#1.5.2(aqua/imports/.*\\.ya?ml)",
   ],
   ignorePaths: [],
   regexManagers: [
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export AQUA_POLICY_CONFIG=$PWD/aqua-policy.yaml:$AQUA_POLICY_CONFIG
		export AQUA_POLICY_CONFIG=$PWD/aqua/policy.yaml:$AQUA_POLICY_CONFIG