Skip to content

Commit f0cff49

Browse files
lpirolalpirola
committed
fix: update submodules
1 parent d029c97 commit f0cff49

18 files changed

Lines changed: 118 additions & 59 deletions

‎.github/workflows/develop.yml‎

Lines changed: 20 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ jobs:
1111
permissions:
1212
contents: read
1313
packages: write
14-
14+
1515
steps:
1616
- name: Checkout
1717
uses: actions/checkout@v4
1818
with:
1919
submodules: recursive
20-
20+
token: ${{ secrets.GITHUB_TOKEN }}
21+
2122
- name: Extract branch tag
2223
id: tag
2324
run: |
@@ -63,30 +64,6 @@ jobs:
6364
labels: ${{ steps.meta.outputs.labels }}
6465
platforms: linux/amd64
6566

66-
- name: Checkout GitOps repo
67-
uses: actions/checkout@v4
68-
with:
69-
repository: lpirola/gitops-caicara-dev
70-
token: ${{ secrets.GITOPS_TOKEN }}
71-
path: gitops
72-
73-
- name: Update GitOps values.yaml
74-
run: |
75-
IMAGE_TAG="${{ steps.tag.outputs.tag }}"
76-
77-
# Update image tag in values.yaml
78-
sed -i "s/tag: .*/tag: ${IMAGE_TAG}/" gitops/clusters/production/applications/mapas/values.yaml
79-
80-
# Show diff
81-
git -C gitops diff clusters/production/applications/mapas/values.yaml
82-
83-
# Commit and push
84-
git -C gitops config user.name "github-actions[bot]"
85-
git -C gitops config user.email "github-actions[bot]@users.noreply.github.com"
86-
git -C gitops add clusters/production/applications/mapas/values.yaml
87-
git -C gitops commit -m "chore: update mapas image to ${IMAGE_TAG} (develop branch)"
88-
git -C gitops push
89-
9067
helm-test:
9168
runs-on: ubuntu-latest
9269
needs: docker
@@ -95,20 +72,15 @@ jobs:
9572
uses: actions/checkout@v4
9673
with:
9774
submodules: recursive
98-
75+
token: ${{ secrets.GITHUB_TOKEN }}
76+
9977
- name: Extract branch tag
10078
id: tag
10179
run: |
10280
BRANCH=${{ github.ref_name }}
10381
TAG="${BRANCH/dev\//}"
10482
echo "tag=v${TAG}" >> $GITHUB_OUTPUT
10583
106-
- name: Checkout GitOps repo
107-
uses: actions/checkout@v4
108-
with:
109-
repository: lpirola/gitops-caicara-dev
110-
path: gitops
111-
11284
- name: Set up Helm
11385
uses: azure/setup-helm@v4
11486
with:
@@ -123,25 +95,31 @@ jobs:
12395
- name: Load Docker image into kind
12496
run: |
12597
TAG="${{ steps.tag.outputs.tag }}"
126-
docker pull ghcr.io/${{ github.repository }}:${TAG}
127-
kind load docker-image ghcr.io/${{ github.repository }}:${TAG} --name mapas-test
98+
REPO="${{ github.repository }}"
99+
REPO_LOWER=$(echo "$REPO" | tr '[:upper:]' '[:lower:]')
100+
docker pull ghcr.io/${REPO_LOWER}:${TAG}
101+
kind load docker-image ghcr.io/${REPO_LOWER}:${TAG} --name mapas-test
128102
129103
- name: Install helm chart
130104
run: |
131105
TAG="${{ steps.tag.outputs.tag }}"
132-
helm install mapas gitops/charts/mapas \
106+
REPO="${{ github.repository }}"
107+
REPO_LOWER=$(echo "$REPO" | tr '[:upper:]' '[:lower:]')
108+
helm install mapas helm/mapas \
133109
--namespace mapas-test \
134110
--create-namespace \
135-
--set image.repository=ghcr.io/${{ github.repository }} \
111+
--set image.repository=ghcr.io/${REPO_LOWER} \
136112
--set image.tag=${TAG} \
137-
--set postgresql.enabled=false \
138-
--set redis.enabled=false \
139-
--set redisSession.enabled=false \
140-
--set env.MAPASCULTURAIS_SKIP_DB_INIT=true \
113+
--set postgresql.enabled=true \
114+
--set redisCache.enabled=false \
115+
--set redisSessions.enabled=false \
116+
--set mapas.appEnv=development \
117+
--set mapas.appDebug=true \
118+
--set-json mapas.extraEnv='[{"name":"MAPASCULTURAIS_SKIP_DB_INIT","value":"true"}]' \
141119
--wait \
142120
--timeout 5m
143121
144122
- name: Verify deployment
145123
run: |
146124
kubectl get pods -n mapas-test
147-
kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=mapas -n mapas-test --timeout=2m
125+
kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=mapas -n mapas-test --timeout 2m

‎.github/workflows/release.yml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ jobs:
1717
uses: actions/checkout@v4
1818
with:
1919
submodules: recursive
20-
20+
token: ${{ secrets.GITHUB_TOKEN }}
21+
2122
- name: Docker meta
2223
id: meta
2324
uses: docker/metadata-action@v5
@@ -69,14 +70,8 @@ jobs:
6970
- name: Update GitOps values.yaml
7071
run: |
7172
IMAGE_TAG="${{ steps.version.outputs.tag }}"
72-
73-
# Update image tag in values.yaml
7473
sed -i "s/tag: .*/tag: ${IMAGE_TAG}/" gitops/clusters/production/applications/mapas/values.yaml
75-
76-
# Show diff
7774
git -C gitops diff clusters/production/applications/mapas/values.yaml
78-
79-
# Commit and push
8075
git -C gitops config user.name "github-actions[bot]"
8176
git -C gitops config user.email "github-actions[bot]@users.noreply.github.com"
8277
git -C gitops add clusters/production/applications/mapas/values.yaml
@@ -91,7 +86,8 @@ jobs:
9186
uses: actions/checkout@v4
9287
with:
9388
submodules: recursive
94-
89+
token: ${{ secrets.GITHUB_TOKEN }}
90+
9591
- name: Set up Helm
9692
uses: azure/setup-helm@v4
9793
with:
@@ -106,25 +102,31 @@ jobs:
106102
- name: Load Docker image into kind
107103
run: |
108104
IMAGE_TAG="${{ github.ref_name }}"
109-
docker pull ghcr.io/${{ github.repository }}:${IMAGE_TAG}
110-
kind load docker-image ghcr.io/${{ github.repository }}:${IMAGE_TAG} --name mapas-test
105+
REPO="${{ github.repository }}"
106+
REPO_LOWER=$(echo "$REPO" | tr '[:upper:]' '[:lower:]')
107+
docker pull ghcr.io/${REPO_LOWER}:${IMAGE_TAG}
108+
kind load docker-image ghcr.io/${REPO_LOWER}:${IMAGE_TAG} --name mapas-test
111109
112110
- name: Install helm chart
113111
run: |
114112
IMAGE_TAG="${{ github.ref_name }}"
115-
helm install mapas gitops/charts/mapas \
113+
REPO="${{ github.repository }}"
114+
REPO_LOWER=$(echo "$REPO" | tr '[:upper:]' '[:lower:]')
115+
helm install mapas helm/mapas \
116116
--namespace mapas-test \
117117
--create-namespace \
118-
--set image.repository=ghcr.io/${{ github.repository }} \
118+
--set image.repository=ghcr.io/${REPO_LOWER} \
119119
--set image.tag=${IMAGE_TAG} \
120120
--set postgresql.enabled=true \
121-
--set redis.enabled=false \
122-
--set redisSession.enabled=false \
123-
--set env.MAPASCULTURAIS_SKIP_DB_INIT=true \
121+
--set redisCache.enabled=false \
122+
--set redisSessions.enabled=false \
123+
--set mapas.appEnv=development \
124+
--set mapas.appDebug=true \
125+
--set-json mapas.extraEnv='[{"name":"MAPASCULTURAIS_SKIP_DB_INIT","value":"true"}]' \
124126
--wait \
125127
--timeout 5m
126128
127129
- name: Verify deployment
128130
run: |
129131
kubectl get pods -n mapas-test
130-
kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=mapas -n mapas-test --timeout=2m
132+
kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=mapas -n mapas-test --timeout 2m

‎.gitmodules‎

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,67 @@
1+
[submodule "src/themes/Funarte"]
2+
path = src/themes/Funarte
3+
url = https://github.com/RedeMapas/theme-Funarte.git
4+
5+
[submodule "src/themes/RCV"]
6+
path = src/themes/RCV
7+
url = https://gitlab.hacklab.com.br/mapas/theme-rcv.git
8+
9+
[submodule "src/themes/RedeMapas"]
10+
path = src/themes/RedeMapas
11+
url = https://github.com/RedeMapas/theme-RedeMapas.git
12+
13+
[submodule "src/themes/MapaMinC"]
14+
path = src/themes/MapaMinC
15+
url = https://github.com/culturagovbr/theme-MapaMinC.git
16+
17+
[submodule "src/themes/Pnab"]
18+
path = src/themes/Pnab
19+
url = https://github.com/culturagovbr/theme-Pnab.git
20+
21+
[submodule "src/themes/PeriferiaViva25"]
22+
path = src/themes/PeriferiaViva25
23+
url = https://github.com/Periferias/theme-ppv-25.git
24+
25+
[submodule "src/plugins/SpamDetector"]
26+
path = src/plugins/SpamDetector
27+
url = https://github.com/mapasculturais/plugin-SpamDetector.git
28+
29+
[submodule "src/plugins/MultipleLocalAuth"]
30+
path = src/plugins/MultipleLocalAuth
31+
url = https://github.com/RedeMapas/plugin-MultipleLocalAuth.git
32+
33+
[submodule "src/plugins/ValuersManagement"]
34+
path = src/plugins/ValuersManagement
35+
url = https://github.com/mapasculturais/plugin-ValuersManagement.git
36+
37+
[submodule "src/plugins/WhatsAppFloating"]
38+
path = src/plugins/WhatsAppFloating
39+
url = https://github.com/RedeMapas/plugin-WhatsAppFloating.git
40+
41+
[submodule "src/plugins/CustomEntity"]
42+
path = src/plugins/CustomEntity
43+
url = https://github.com/mapasculturais/plugin-CustomEntity.git
44+
45+
[submodule "src/plugins/ListmonkSync"]
46+
path = src/plugins/ListmonkSync
47+
url = https://github.com/RedeMapas/plugin-ListmonkSync.git
48+
49+
[submodule "src/plugins/AdminLoginAsUser"]
50+
path = src/plugins/AdminLoginAsUser
51+
url = https://github.com/mapasculturais/plugin-AdminLoginAsUser.git
52+
53+
[submodule "src/plugins/RecreatePCacheOnLogin"]
54+
path = src/plugins/RecreatePCacheOnLogin
55+
url = https://github.com/mapasculturais/plugin-RecreatePCacheOnLogin.git
56+
157
[submodule "src/plugins/MapasNetwork"]
258
path = src/plugins/MapasNetwork
3-
url = git@github.com:RedeMapas/plugin-MapasNetwork.git
59+
url = https://github.com/RedeMapas/plugin-MapasNetwork.git
60+
61+
[submodule "src/plugins/Metabase"]
62+
path = src/plugins/Metabase
63+
url = https://github.com/RedeMapas/plugin-Metabase.git
64+
65+
[submodule "src/plugins/MapasBlame"]
66+
path = src/plugins/MapasBlame
67+
url = https://github.com/mapasculturais/plugin-MapasBlame.git

‎src/plugins/AdminLoginAsUser‎

Submodule AdminLoginAsUser added at 608d928

‎src/plugins/CustomEntity‎

Submodule CustomEntity added at 3acfb25

‎src/plugins/MapasBlame‎

Submodule MapasBlame added at 093fad6

‎src/plugins/Metabase‎

Submodule Metabase added at 2f334dc

‎src/plugins/MultipleLocalAuth‎

Submodule MultipleLocalAuth added at 95616aa

‎src/plugins/RecreatePCacheOnLogin‎

Submodule RecreatePCacheOnLogin added at 1ef9479

‎src/plugins/SpamDetector‎

Submodule SpamDetector added at 1e68201

0 commit comments

Comments
 (0)