Merge pull request #185 from hpidcock/add-3.6

Add 3.6 support.
juju · Apr 18, 2024 · cf273d8 · cf273d8
2 parents 2051261 + db88ef0
commit cf273d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/jobs/ci-run/integration/gen/test-sidecar.yml b/jobs/ci-run/integration/gen/test-sidecar.yml
@@ -103,7 +103,7 @@
             test_name: 'sidecar'
             setup_steps: ''
             task_name: 'test_deploy_and_force_remove_application'
-            skip_tasks: 'test_deploy_and_remove_application,test_pebble_notices,test_pebble_change_updated'
+            skip_tasks: 'test_deploy_and_remove_application,test_pebble_notices'
     publishers:
       - integration-artifacts
 
@@ -171,7 +171,7 @@
             test_name: 'sidecar'
             setup_steps: ''
             task_name: 'test_deploy_and_remove_application'
-            skip_tasks: 'test_deploy_and_force_remove_application,test_pebble_notices,test_pebble_change_updated'
+            skip_tasks: 'test_deploy_and_force_remove_application,test_pebble_notices'
     publishers:
       - integration-artifacts
 
@@ -245,6 +245,6 @@
                   test_name: 'sidecar'
                   setup_steps: ''
                   task_name: 'test_pebble_notices'
-                  skip_tasks: 'test_deploy_and_force_remove_application,test_deploy_and_remove_application,test_pebble_change_updated'
+                  skip_tasks: 'test_deploy_and_force_remove_application,test_deploy_and_remove_application'
     publishers:
       - integration-artifacts
diff --git a/jobs/github/mergejobs.yaml b/jobs/github/mergejobs.yaml
@@ -61,6 +61,7 @@
       - "3.3": {}
       - "3.4": {}
       - "3.5": {}
+      - "3.6": {}
     jobs:
       - 'github-juju-merge-jobs-{branch_name}'
 

diff --git a/tools/gen-wire-tests/main.go b/tools/gen-wire-tests/main.go
@@ -73,6 +73,7 @@ var minVersionRegex = map[string]string{
 	"3.3": "^[4-9].*|^3\\\\.([3-9]|\\\\d{2,})(\\\\.|-).*",
 	"3.4": "^[4-9].*|^3\\\\.([4-9]|\\\\d{2,})(\\\\.|-).*",
 	"3.5": "^[4-9].*|^3\\\\.([5-9]|\\\\d{2,})(\\\\.|-).*",
+	"3.6": "^[4-9].*|^3\\\\.([6-9]|\\\\d{2,})(\\\\.|-).*",
 	"4.0": "^[5-9].*|^4\\\\.([0-9]|\\\\d{2,})(\\\\.|-).*",
 }