From 2d8bd76834515f8f6f0bea3dd426f9c6f687966a Mon Sep 17 00:00:00 2001
From: Andrew Rothstein <andrew.rothstein@gmail.com>
Date: Mon, 17 Jun 2024 16:18:58 +0000
Subject: [PATCH] latest CIs

---
 .github/workflows/build.yml | 47 +++-------------------------------
 dcb-os.yml                  | 13 ----------
 meta/main.yml               | 32 ++++++++++++------------
 platform-matrix-v1.json     | 50 +++++++++++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 73 deletions(-)
 delete mode 100644 dcb-os.yml
 create mode 100644 platform-matrix-v1.json

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a828384..bb3428d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,46 +1,5 @@
 ---
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: install python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: install task
-      uses: arduino/setup-task@v1
-      with:
-        repo-token: ${{ github.token }}
-    - name: task ver
-      run: task --version
-    - name: download task mono
-      uses: actions/checkout@v3
-      with:
-        path: taskmono
-        ref: develop
-        repository: andrewrothstein/tasks
-    - name: 'task #ftw'
-      run: task -t taskmono/ansible-test-role.yml "targetuser=${{ github.actor }}"
-        "targetpwd=${{ github.token }}" "alltags=${{ matrix.os }}"
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-        - alpine_3.17
-        - alpine_3.18
-        - alpine_edge
-        - archlinux_latest
-        - debian_bookworm
-        - debian_bullseye
-        - fedora_37
-        - fedora_38
-        - rockylinux_8
-        - rockylinux_9
-        - ubuntu_focal
-        - ubuntu_jammy
-        python-version:
-        - '3.11'
-name: dcb
-'on':
-- push
+  bake-ansible-images-v1:
+    uses: andrewrothstein/.github/.github/workflows/bake-ansible-images-v1.yml@develop
+'on': push
diff --git a/dcb-os.yml b/dcb-os.yml
deleted file mode 100644
index ba8e4b7..0000000
--- a/dcb-os.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- alpine_3.17
-- alpine_3.18
-- alpine_edge
-- archlinux_latest
-- debian_bookworm
-- debian_bullseye
-- fedora_37
-- fedora_38
-- rockylinux_8
-- rockylinux_9
-- ubuntu_focal
-- ubuntu_jammy
diff --git a/meta/main.yml b/meta/main.yml
index 0f96b4e..9d82a16 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,34 +1,34 @@
 ---
 galaxy_info:
   author: Andrew Rothstein
-  description: role for configuring http(s) network proxies
   company: BlackRock
-  license:
-    - MIT
-  min_ansible_version: 2.0
+  description: role for configuring http(s) network proxies
+  galaxy_tags:
+    - network
+  license: MIT
+  min_ansible_version: '2.0'
+  namespace: andrewrothstein
   platforms:
     - name: Alpine
-      version:
-        - all
-    - name: Archlinux
-      version:
+      versions:
         - all
-    - name: EL
+    - name: ArchLinux
       versions:
-        - 8
-        - 9
+        - all
     - name: Debian
       versions:
         - bookworm
         - bullseye
+    - name: EL
+      versions:
+        - '8'
+        - '9'
     - name: Fedora
       versions:
-        - 37
-        - 38
+        - '39'
+        - '40'
     - name: Ubuntu
       versions:
-        - focal
         - jammy
-  galaxy_tags:
-    - network
+        - noble
   role_name: proxify
diff --git a/platform-matrix-v1.json b/platform-matrix-v1.json
new file mode 100644
index 0000000..f955e44
--- /dev/null
+++ b/platform-matrix-v1.json
@@ -0,0 +1,50 @@
+[
+  {
+    "OS": "alpine",
+    "OS_VER": "3.19"
+  },
+  {
+    "OS": "alpine",
+    "OS_VER": "3.20"
+  },
+  {
+    "OS": "alpine",
+    "OS_VER": "edge"
+  },
+  {
+    "OS": "archlinux",
+    "OS_VER": "latest"
+  },
+  {
+    "OS": "debian",
+    "OS_VER": "bookworm"
+  },
+  {
+    "OS": "debian",
+    "OS_VER": "bullseye"
+  },
+  {
+    "OS": "fedora",
+    "OS_VER": "39"
+  },
+  {
+    "OS": "fedora",
+    "OS_VER": "40"
+  },
+  {
+    "OS": "rockylinux",
+    "OS_VER": "8"
+  },
+  {
+    "OS": "rockylinux",
+    "OS_VER": "9"
+  },
+  {
+    "OS": "ubuntu",
+    "OS_VER": "jammy"
+  },
+  {
+    "OS": "ubuntu",
+    "OS_VER": "noble"
+  }
+]
\ No newline at end of file