fix: bump makejinja and add force flag to Taskfile (#1166)

* fix: bump makejinja and add force flag to Taskfile Signed-off-by: Devin Buhl <[email protected]> * chore: Run configure again to ensure idempotency Signed-off-by: Devin Buhl <[email protected]> --------- Signed-off-by: Devin Buhl <[email protected]>
onedr0p · Jan 16, 2024 · b0ea9af · b0ea9af
1 parent 72e7d17
commit b0ea9af
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -112,6 +112,10 @@ jobs:
         shell: bash
         run: task configure --yes
 
+      - name: Run configure again to ensure idempotency
+        shell: bash
+        run: task configure --yes
+
       - name: Run kubeconform
         shell: bash
         run: ./.github/scripts/kubeconform.sh ./kubernetes

diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -64,7 +64,7 @@ tasks:
   .template:
     internal: true
     cmds:
-      - ./.venv/bin/makejinja
+      - ./.venv/bin/makejinja --force
       - task: sops:encrypt:all
     preconditions:
       - { msg: "bootstrap addons file not found", sh: "test -f {{.BOOTSTRAP_DIR}}/vars/addons.yaml" }

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,8 @@
-ansible==9.1.0
 ansible-lint==6.22.1
-# https://github.com/pyca/bcrypt/issues/684
-bcrypt==4.1.2
+ansible==9.1.0
+bcrypt==4.1.2 # https://github.com/pyca/bcrypt/issues/684
 jmespath==1.0.1
-makejinja==2.3.4
+makejinja==2.3.5
 netaddr==0.10.1
 openshift==0.13.2
 passlib==1.7.4