From bb97049c6f9f2c015401b59ced57c1ef2e5105a3 Mon Sep 17 00:00:00 2001
From: Jiri Malak <malak.jiri@gmail.com>
Date: Thu, 21 Mar 2024 23:07:17 +0100
Subject: [PATCH] CI-CD: modify scripts to handle multiple architectures in
 matrix

---
 .github/actions/artfload/action.yml |  6 ++---
 .github/actions/artfsave/action.yml |  6 ++---
 .github/actions/boot/action.yml     | 19 ++++++++++------
 .github/actions/build/action.yml    | 35 ++++++++++++++++-------------
 .github/actions/docbuild/action.yml | 15 ++++++++-----
 .github/actions/dosboxin/action.yml |  8 +++----
 .github/actions/ghassets/action.yml |  6 ++---
 .github/actions/install/action.yml  | 34 ++++++++++++++--------------
 .github/actions/lastbld/action.yml  |  4 ++--
 .github/actions/release/action.yml  |  4 ++--
 .github/actions/relload/action.yml  | 24 ++++++++++----------
 .github/actions/snapshot/action.yml |  6 ++---
 .github/actions/tarload/action.yml  | 16 ++++++-------
 .github/actions/tarsave/action.yml  | 16 ++++++-------
 .github/actions/testboot/action.yml |  8 +++----
 .github/actions/tests/action.yml    | 11 ++++++---
 .github/workflows/ci-build.yml      | 25 ++++++++++-----------
 .github/workflows/cibldlnx.yml      | 12 ++++++----
 .github/workflows/cibldnt.yml       | 15 ++++++++-----
 .github/workflows/cibldosx.yml      |  6 +++--
 .github/workflows/coverity.yml      | 10 ++++-----
 .github/workflows/rel-lnx.yml       |  7 ++++--
 .github/workflows/rel-nt.yml        | 10 ++++++---
 .github/workflows/rel-osx.yml       |  6 +++--
 .github/workflows/release.yml       |  9 +++-----
 .github/workflows/wikidocs.yml      |  6 +++--
 26 files changed, 181 insertions(+), 143 deletions(-)

diff --git a/.github/actions/artfload/action.yml b/.github/actions/artfload/action.yml
index 3e62dd286d..81f5cccadb 100644
--- a/.github/actions/artfload/action.yml
+++ b/.github/actions/artfload/action.yml
@@ -1,8 +1,8 @@
 name: artifact-load
 description: 'Download Artifact (tar file) and restore it to git subdirectory'
 inputs:
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
@@ -67,7 +67,7 @@ runs:
     name: Restore Artifact
     uses: "./.github/actions/tarload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  ${{ inputs.gitpath }}
       fullname: ${{ steps.tarname.outputs.fullname }}
       owdebug:  ${{ inputs.owdebug }}
diff --git a/.github/actions/artfsave/action.yml b/.github/actions/artfsave/action.yml
index 5ec8eb6ba9..c8cc07e842 100644
--- a/.github/actions/artfsave/action.yml
+++ b/.github/actions/artfsave/action.yml
@@ -1,8 +1,8 @@
 name: artifact-save
 description: 'Upload Artifact (tar file), first create it from git subdirectory'
 inputs:
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
@@ -56,7 +56,7 @@ runs:
   - if: inputs.noarchive == ''
     uses: "./.github/actions/tarsave"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  ${{ inputs.gitpath }}
       fullname: ${{ steps.tarname.outputs.fullname }}
       owdebug:  ${{ inputs.owdebug }}
diff --git a/.github/actions/boot/action.yml b/.github/actions/boot/action.yml
index d84b40e55f..99368b7d6c 100644
--- a/.github/actions/boot/action.yml
+++ b/.github/actions/boot/action.yml
@@ -1,7 +1,12 @@
 name: boot
 description: 'Process OW bootstrap build'
 inputs:
-  arch:
+  hostos:
+    description: 'host os'
+    required: false
+    default: ''
+    type: string
+  suffix:
     description: 'run-time platform'
     required: false
     default: ''
@@ -34,7 +39,7 @@ inputs:
 runs:
   using: composite
   steps:
-  - if: inputs.arch == 'lnx' || inputs.arch == 'osx'
+  - if: inputs.hostos == 'lnx' || inputs.hostos == 'osx'
     name: Bootstrap
     run: ${{ inputs.bldscript }} ${{ inputs.tools }}
     env:
@@ -44,7 +49,7 @@ runs:
       OWDEBUG:       ${{ inputs.owdebug }}
       OWVERBOSE:     1
     shell: bash
-  - if: inputs.arch == 'nt'
+  - if: inputs.hostos == 'nt'
     name: Bootstrap
     run: ${{ inputs.bldscript }} ${{ inputs.tools }}
     env:
@@ -56,17 +61,17 @@ runs:
     shell: cmd
   - uses: "./.github/actions/artfsave"
     with:
-      arch:         ${{ inputs.arch }}
+      hostos:       ${{ inputs.hostos }}
       gitpath:      'bld watcom binbuild'
-      artifact:     "bld watcom ${{ inputs.arch }}"
+      artifact:     "bld watcom ${{ inputs.suffix }}"
       tools:        ${{ inputs.tools }}
       noarchive:    ${{ inputs.noarchive }}
       owdebug:      ${{ inputs.owdebug }}
   - uses: "./.github/actions/artfsave"
     with:
-      arch:         ${{ inputs.arch }}
+      hostos:       ${{ inputs.hostos }}
       gitpath:      'build binbuild'
-      artifact:     "build ${{ inputs.arch }}"
+      artifact:     "build ${{ inputs.suffix }}"
       tools:        ${{ inputs.tools }}
       noarchive:    ${{ inputs.noarchive }}
       owdebug:      ${{ inputs.owdebug }}
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index ad5aa8c866..9ce1b709a6 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -1,7 +1,12 @@
 name: build
 description: 'Process OW build'
 inputs:
-  arch:
+  hostos:
+    description: 'host os'
+    required: false
+    default: ''
+    type: string
+  suffix:
     description: 'run-time platform'
     required: false
     default: ''
@@ -31,22 +36,22 @@ runs:
   steps:
   - uses: "./.github/actions/dosboxin"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  'bld watcom binbuild'
-      artifact: "bld watcom ${{ inputs.arch }}"
+      artifact: "bld watcom ${{ inputs.suffix }}"
       tools:    ${{ inputs.tools }}
       owdebug:  ${{ inputs.owdebug }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  'build binbuild'
-      artifact: "build ${{ inputs.arch }}"
+      artifact: "build ${{ inputs.suffix }}"
       tools:    ${{ inputs.tools }}
       owdebug:  ${{ inputs.owdebug }}
-  - if: inputs.arch == 'lnx'
+  - if: inputs.hostos == 'lnx'
     name: Build
     run: ${{ inputs.bldscript }} ${{ inputs.tools }}
     env:
@@ -57,7 +62,7 @@ runs:
       OWDEBUG:       ${{ inputs.owdebug }}
       OWVERBOSE:     1
     shell: bash
-  - if: inputs.arch == 'nt'
+  - if: inputs.hostos == 'nt'
     name: Build
     run: ${{ inputs.bldscript }} ${{ inputs.tools }}
     env:
@@ -69,7 +74,7 @@ runs:
       OWDEBUG:       ${{ inputs.owdebug }}
       OWVERBOSE:     1
     shell: cmd
-  - if: inputs.arch == 'osx'
+  - if: inputs.hostos == 'osx'
     name: Build
     run: ${{ inputs.bldscript }} ${{ inputs.tools }}
     env:
@@ -80,19 +85,19 @@ runs:
       OWDEBUG:       ${{ inputs.owdebug }}
       OWVERBOSE:     1
     shell: bash
-  - if: inputs.arch == 'lnx' || inputs.arch == 'nt'
+  - if: inputs.hostos == 'lnx' || inputs.hostos == 'nt'
     uses: "./.github/actions/artfsave"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  'rel'
-      artifact: "rel ${{ inputs.arch }}"
+      artifact: "rel ${{ inputs.suffix }}"
       tools:    ${{ inputs.tools }}
       owdebug:  ${{ inputs.owdebug }}
-  - if: inputs.arch == 'lnx' || inputs.arch == 'nt'
+  - if: inputs.hostos == 'lnx' || inputs.hostos == 'nt'
     uses: "./.github/actions/artfsave"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  'bld setupgui'
-      artifact: "bld setupgui ${{ inputs.arch }}"
+      artifact: "bld setupgui ${{ inputs.suffix }}"
       tools:    ${{ inputs.tools }}
       owdebug:  ${{ inputs.owdebug }}
diff --git a/.github/actions/docbuild/action.yml b/.github/actions/docbuild/action.yml
index 9d6a51fb2f..014dcb0b4e 100644
--- a/.github/actions/docbuild/action.yml
+++ b/.github/actions/docbuild/action.yml
@@ -16,7 +16,12 @@ inputs:
     required: false
     default: ''
     type: string
-  arch:
+  hostos:
+    description: 'host os'
+    required: false
+    default: ''
+    type: string
+  suffix:
     description: 'run-time platform'
     required: false
     default: ''
@@ -46,12 +51,12 @@ runs:
   steps:
   - uses: "./.github/actions/dosboxin"
     with:
-      arch:         ${{ inputs.arch }}
+      hostos:       ${{ inputs.hostos }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:         ${{ inputs.arch }}
+      hostos:       ${{ inputs.hostos }}
       gitpath:      'build binbuild'
-      artifact:     "build ${{ inputs.arch }}"
+      artifact:     "build ${{ inputs.suffix }}"
       tools:        ${{ inputs.tools }}
       noarchive:    ${{ inputs.noarchive }}
       owdebug:      ${{ inputs.owdebug }}
@@ -69,7 +74,7 @@ runs:
     shell: cmd
   - uses: "./.github/actions/artfsave"
     with:
-      arch:         ${{ inputs.arch }}
+      hostos:       ${{ inputs.hostos }}
       gitpath:      ${{ inputs.gitpath }}
       artifact:     "rel ${{ inputs.target }}"
       tools:        ${{ inputs.tools }}
diff --git a/.github/actions/dosboxin/action.yml b/.github/actions/dosboxin/action.yml
index 75ba9eb9b8..046b13b34d 100644
--- a/.github/actions/dosboxin/action.yml
+++ b/.github/actions/dosboxin/action.yml
@@ -1,15 +1,15 @@
 name: dosbox-instalation
 description: 'Install DOSBOX run-time if necessary'
 inputs:
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
 runs:
   using: composite
   steps:
-  - if: inputs.arch == 'lnx'
+  - if: inputs.hostos == 'lnx'
     name: Install DOSBOX
     run: |
       for i in {1..3}
@@ -21,7 +21,7 @@ runs:
         fi
       done
     shell: bash
-  - if: inputs.arch == 'osx'
+  - if: inputs.hostos == 'osx'
     name: Install DOSBOX-X
     run: brew install dosbox-x
     shell: bash
diff --git a/.github/actions/ghassets/action.yml b/.github/actions/ghassets/action.yml
index 411d72cd82..81d7b8f3b1 100644
--- a/.github/actions/ghassets/action.yml
+++ b/.github/actions/ghassets/action.yml
@@ -1,8 +1,8 @@
 name: github-release-assets
 description: 'Upload release asset file (day and month release)'
 inputs:
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
@@ -41,7 +41,7 @@ runs:
   steps:
   - uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       artifact: "install ${{ inputs.target }}"
       gitpath:  'temp'
       owdebug:  ${{ inputs.owdebug }}
diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
index c3bb850a5c..ce89a648a1 100644
--- a/.github/actions/install/action.yml
+++ b/.github/actions/install/action.yml
@@ -6,8 +6,8 @@ inputs:
     required: false
     default: ''
     type: string
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
@@ -39,40 +39,40 @@ inputs:
 runs:
   using: composite
   steps:
-  - if: inputs.arch == 'lnx'
+  - if: inputs.hostos == 'lnx'
     uses: "./.github/actions/artfload"
     with:
-      arch:         'lnx'
+      hostos:       ${{ inputs.hostos }}
       gitpath:      'build binbuild'
-      artifact:     'build lnx'
+      artifact:     'build lnx-x64'
       tools:        ${{ inputs.tools_lnx }}
       owdebug:      ${{ inputs.owdebug }}
-  - if: inputs.arch == 'nt'
+  - if: inputs.hostos == 'nt'
     uses: "./.github/actions/artfload"
     with:
-      arch:         'nt'
+      hostos:       ${{ inputs.hostos }}
       gitpath:      'build binbuild'
-      artifact:     'build nt'
+      artifact:     'build nt-x64'
       tools:        ${{ inputs.tools_nt }}
       owdebug:      ${{ inputs.owdebug }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:         ${{ inputs.arch }}
+      hostos:       ${{ inputs.hostos }}
       gitpath:      'bld setupgui'
-      artifact:     'bld setupgui nt'
+      artifact:     'bld setupgui nt-x64'
       tools:        ${{ inputs.tools_nt }}
       owdebug:      ${{ inputs.owdebug }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:         ${{ inputs.arch }}
+      hostos:       ${{ inputs.hostos }}
       gitpath:      'bld setupgui'
-      artifact:     'bld setupgui lnx'
+      artifact:     'bld setupgui lnx-x64'
       tools:        ${{ inputs.tools_lnx }}
       owdebug:      ${{ inputs.owdebug }}
   # load all release binaries
   - uses: "./.github/actions/relload"
     with:
-      arch:         ${{ inputs.arch }}
+      hostos:       ${{ inputs.hostos }}
       gitpath:      'rel'
       tools_nt:     ${{ inputs.tools_nt }}
       tools_lnx:    ${{ inputs.tools_lnx }}
@@ -82,11 +82,11 @@ runs:
     id: owsnapshot
     uses: "./.github/actions/snapshot"
     with:
-      arch:         ${{ inputs.arch }}
+      hostos:       ${{ inputs.hostos }}
       gitpath:      'rel'
       owdebug:      ${{ inputs.owdebug }}
   # run build script
-  - if: inputs.target != 'snapshot' && ( inputs.arch == 'lnx' )
+  - if: inputs.target != 'snapshot' && ( inputs.hostos == 'lnx' )
     name: Build Installers
     run: ${{ inputs.bldscript }} ${{ inputs.tools_lnx }}
     env:
@@ -97,7 +97,7 @@ runs:
       OWINSTTARGET:  ${{ inputs.target }}
       OWVERBOSE:     1
     shell: bash
-  - if: inputs.target != 'snapshot' && inputs.arch == 'nt'
+  - if: inputs.target != 'snapshot' && inputs.hostos == 'nt'
     name: Build Installers
     run: ${{ inputs.bldscript }} ${{ inputs.tools_nt }}
     env:
@@ -112,7 +112,7 @@ runs:
   # full content of directory, cannot specify files
   - uses: "./.github/actions/artfsave"
     with:
-      arch:         ${{ inputs.arch }}
+      hostos:       ${{ inputs.hostos }}
       gitpath:      'distrib ow bin'
       artifact:     "install ${{ inputs.target }}"
       owdebug:      ${{ inputs.owdebug }}
diff --git a/.github/actions/lastbld/action.yml b/.github/actions/lastbld/action.yml
index c1a678d3de..86f5228599 100644
--- a/.github/actions/lastbld/action.yml
+++ b/.github/actions/lastbld/action.yml
@@ -1,8 +1,8 @@
 name: last-build
 description: 'Create new OW release on GitHub and upload snapshot archive'
 inputs:
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
index 259b4dd68f..74e3a963e6 100644
--- a/.github/actions/release/action.yml
+++ b/.github/actions/release/action.yml
@@ -1,8 +1,8 @@
 name: release
 description: 'Create new day and month Release on GitHub'
 inputs:
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
diff --git a/.github/actions/relload/action.yml b/.github/actions/relload/action.yml
index dc6f808b24..54ffc12054 100644
--- a/.github/actions/relload/action.yml
+++ b/.github/actions/relload/action.yml
@@ -1,8 +1,8 @@
 name: release-load-all
 description: 'Load all artifact for OW Release'
 inputs:
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
@@ -31,56 +31,56 @@ runs:
   steps:
   - uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  ${{ inputs.gitpath }}
-      artifact: 'rel nt'
+      artifact: 'rel nt-x64'
       tools:    ${{ inputs.tools_nt }}
       owdebug:  ${{ inputs.owdebug }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  ${{ inputs.gitpath }}
-      artifact: 'rel lnx'
+      artifact: 'rel lnx-x64'
       tools:    ${{ inputs.tools_lnx }}
       owdebug:  ${{ inputs.owdebug }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  ${{ inputs.gitpath }}
       artifact: 'rel docdos'
       tools:    ${{ inputs.tools_nt }}
       owdebug:  ${{ inputs.owdebug }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  ${{ inputs.gitpath }}
       artifact: 'rel docchm'
       tools:    ${{ inputs.tools_nt }}
       owdebug:  ${{ inputs.owdebug }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  ${{ inputs.gitpath }}
       artifact: 'rel docnt'
       tools:    ${{ inputs.tools_nt }}
       owdebug:  ${{ inputs.owdebug }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  ${{ inputs.gitpath }}
       artifact: 'rel docos2'
       tools:    ${{ inputs.tools_nt }}
       owdebug:  ${{ inputs.owdebug }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  ${{ inputs.gitpath }}
       artifact: 'rel docpdf'
       tools:    ${{ inputs.tools_nt }}
       owdebug:  ${{ inputs.owdebug }}
   - uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  ${{ inputs.gitpath }}
       artifact: 'rel docwin'
       tools:    ${{ inputs.tools_nt }}
diff --git a/.github/actions/snapshot/action.yml b/.github/actions/snapshot/action.yml
index e09e143314..55b28f9e36 100644
--- a/.github/actions/snapshot/action.yml
+++ b/.github/actions/snapshot/action.yml
@@ -1,8 +1,8 @@
 name: last-build
 description: 'Create OW snapshot Archive (compressed tar)'
 inputs:
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
@@ -51,7 +51,7 @@ runs:
     shell: pwsh
   - uses: "./.github/actions/tarsave"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  ${{ inputs.gitpath }}
       fullname: ${{ steps.tarname.outputs.fullname }}
       owdebug:  ${{ inputs.owdebug }}
diff --git a/.github/actions/tarload/action.yml b/.github/actions/tarload/action.yml
index 447b4c64b9..6746593b5b 100644
--- a/.github/actions/tarload/action.yml
+++ b/.github/actions/tarload/action.yml
@@ -1,8 +1,8 @@
 name: tar-load
 description: 'Extract tar file to git sub-directory, create it if necessary'
 inputs:
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
@@ -48,28 +48,28 @@ runs:
   - name: Create destination folder
     run: New-Item -ErrorAction SilentlyContinue -ItemType Directory -Path ${{ steps.dstpath.outputs.path }} > $null
     shell: pwsh
-  - if: inputs.arch == 'lnx' && inputs.format == 'gzip'
+  - if: inputs.hostos == 'lnx' && inputs.format == 'gzip'
     name: Restore Artifact Linux
     run: tar ${{ steps.tarcmd.outputs.opts }} "${{ inputs.fullname }}" -z --overwrite -C "${{ steps.dstpath.outputs.path }}"
     shell: bash
-  - if: inputs.arch == 'lnx' && inputs.format != 'gzip'
+  - if: inputs.hostos == 'lnx' && inputs.format != 'gzip'
     name: Restore Artifact Linux
     run: tar ${{ steps.tarcmd.outputs.opts }} "${{ inputs.fullname }}" -J --overwrite -C "${{ steps.dstpath.outputs.path }}"
     shell: bash
-  - if: inputs.arch == 'osx' && inputs.format == 'gzip'
+  - if: inputs.hostos == 'osx' && inputs.format == 'gzip'
     name: Restore Artifact OSX
     run: gtar ${{ steps.tarcmd.outputs.opts }} "${{ inputs.fullname }}" -z --overwrite -C "${{ steps.dstpath.outputs.path }}"
     shell: bash
-  - if: inputs.arch == 'osx' && inputs.format != 'gzip'
+  - if: inputs.hostos == 'osx' && inputs.format != 'gzip'
     name: Restore Artifact OSX
     run: gtar ${{ steps.tarcmd.outputs.opts }} "${{ inputs.fullname }}" -J --overwrite -C "${{ steps.dstpath.outputs.path }}"
     shell: bash
-  - if: inputs.arch == 'nt' && inputs.format == 'gzip'
+  - if: inputs.hostos == 'nt' && inputs.format == 'gzip'
     name: Restore Artifact (Windows)
     run: |
       7z x -aoa "${{ inputs.fullname }}" -o${{ steps.dstpath.outputs.path }}
     shell: cmd
-  - if: inputs.arch == 'nt' && inputs.format != 'gzip'
+  - if: inputs.hostos == 'nt' && inputs.format != 'gzip'
     name: Restore Artifact (Windows)
     run: |
       7z x -txz "${{ inputs.fullname }}" -o${{ runner.temp }}
diff --git a/.github/actions/tarsave/action.yml b/.github/actions/tarsave/action.yml
index aec5f2470a..039186550e 100644
--- a/.github/actions/tarsave/action.yml
+++ b/.github/actions/tarsave/action.yml
@@ -1,8 +1,8 @@
 name: tar-save
 description: 'Create compressed tar file with git sub-directory full contents'
 inputs:
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
@@ -45,23 +45,23 @@ runs:
         'opts=-cf' | Out-File -FilePath ${{ github.output }} -Encoding utf8 -Append
       }
     shell: pwsh      
-  - if: inputs.arch == 'lnx' && inputs.format == 'gzip'
+  - if: inputs.hostos == 'lnx' && inputs.format == 'gzip'
     name: Create tar File Linux
     run: tar ${{ steps.tarcmd.outputs.opts }} "${{ inputs.fullname }}" -z --overwrite -C "${{ steps.srcpath.outputs.path }}" .
     shell: bash
-  - if: inputs.arch == 'lnx' && inputs.format != 'gzip'
+  - if: inputs.hostos == 'lnx' && inputs.format != 'gzip'
     name: Create tar File Linux
     run: tar ${{ steps.tarcmd.outputs.opts }} "${{ inputs.fullname }}" -J --overwrite -C "${{ steps.srcpath.outputs.path }}" .
     shell: bash
-  - if: inputs.arch == 'osx' && inputs.format == 'gzip'
+  - if: inputs.hostos == 'osx' && inputs.format == 'gzip'
     name: Create tar File OSX
     run: gtar ${{ steps.tarcmd.outputs.opts }} "${{ inputs.fullname }}" -z --overwrite -C "${{ steps.srcpath.outputs.path }}" .
     shell: bash
-  - if: inputs.arch == 'osx' && inputs.format != 'gzip'
+  - if: inputs.hostos == 'osx' && inputs.format != 'gzip'
     name: Create tar File OSX
     run: gtar ${{ steps.tarcmd.outputs.opts }} "${{ inputs.fullname }}" -J --overwrite -C "${{ steps.srcpath.outputs.path }}" .
     shell: bash
-  - if: inputs.arch == 'nt' && inputs.format == 'gzip'
+  - if: inputs.hostos == 'nt' && inputs.format == 'gzip'
     name: Create tar File (Windows)
     run: |
       7z a "${{ inputs.fullname }}" "${{ steps.srcpath.outputs.path }}"
@@ -69,7 +69,7 @@ runs:
       7z rn "${{ inputs.fullname }}" @lst.txt
       del lst.txt
     shell: cmd
-  - if: inputs.arch == 'nt' && inputs.format != 'gzip'
+  - if: inputs.hostos == 'nt' && inputs.format != 'gzip'
     name: Create tar File (Windows)
     run: |
       tar ${{ steps.tarcmd.outputs.opts }} ${{ runner.temp }}\owartifact.tar -C "${{ steps.srcpath.outputs.path }}" .
diff --git a/.github/actions/testboot/action.yml b/.github/actions/testboot/action.yml
index 825a2c1340..15c2d1b753 100644
--- a/.github/actions/testboot/action.yml
+++ b/.github/actions/testboot/action.yml
@@ -1,8 +1,8 @@
 name: test-boot
 description: 'Process test bootstrap build by OW (for test compatibility)'
 inputs:
-  arch:
-    description: 'run-time platform'
+  hostos:
+    description: 'host os'
     required: false
     default: ''
     type: string
@@ -24,7 +24,7 @@ inputs:
 runs:
   using: composite
   steps:
-  - if: inputs.arch == 'lnx'
+  - if: inputs.hostos == 'lnx'
     name: Test Bootstrap OW
     run: ${{ inputs.bldscript }}
     env:
@@ -37,7 +37,7 @@ runs:
       OWDEBUG:       ${{ inputs.owdebug }}
       OWVERBOSE:     1
     shell: bash
-  - if: inputs.arch == 'nt'
+  - if: inputs.hostos == 'nt'
     name: Test Bootstrap OW
     run: ${{ inputs.bldscript }}
     env:
diff --git a/.github/actions/tests/action.yml b/.github/actions/tests/action.yml
index 1d660f7ba7..a7b5c31e37 100644
--- a/.github/actions/tests/action.yml
+++ b/.github/actions/tests/action.yml
@@ -1,7 +1,12 @@
 name: tests
 description: 'Process OW tests'
 inputs:
-  arch:
+  hostos:
+    description: 'host os'
+    required: false
+    default: ''
+    type: string
+  suffix:
     description: 'run-time platform'
     required: false
     default: ''
@@ -27,8 +32,8 @@ runs:
   - name: Load Artifact
     uses: "./.github/actions/artfload"
     with:
-      arch:     ${{ inputs.arch }}
+      hostos:   ${{ inputs.hostos }}
       gitpath:  'build binbuild'
-      artifact: "build ${{ inputs.arch }}"
+      artifact: "build ${{ inputs.suffix }}"
       tools:    ${{ inputs.tools }}
       owdebug:  ${{ inputs.owdebug }}
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index dd2fc49df7..8fab05cb2e 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Bootstrap Linux OW
       uses: "./.github/actions/testboot"
       with:
-        arch:       'lnx'
+        hostos:     'lnx'
         gitpath:    'ci/ow'
         bldscript:  'ci/buildx.sh'
         owdebug:    ${{ vars.OWDEBUG }}
@@ -53,7 +53,7 @@ jobs:
     - name: Bootstrap Windows OW
       uses: "./.github/actions/testboot"
       with:
-        arch:       'nt'
+        hostos:     'nt'
         gitpath:    'ci\ow'
         bldscript:  'ci/buildx.cmd'
         owdebug:    ${{ vars.OWDEBUG }}
@@ -65,17 +65,15 @@ jobs:
         include:
         - owtools: 'GCC'
           tools:   'gcc'
-          image:   'ubuntu-latest'
         - owtools: 'CLANG'
           tools:   'clang'
-          image:   'ubuntu-latest'
     uses: "./.github/workflows/cibldlnx.yml"
     with:
-      arch:         'lnx'
+      arch:         'x64'
       bldscript:    'ci/buildx.sh'
       tools:        ${{ matrix.tools }}
       owtools:      ${{ matrix.owtools }}
-      image:        ${{ matrix.image }}
+      image:        'ubuntu-latest'
       owdebug:      ${{ vars.OWDEBUG }}
   workflow-nt:
     needs: bootow-nt
@@ -85,14 +83,13 @@ jobs:
         include:
         - owtools: 'VISUALC'
           tools:   'vs2019'
-          image:   'windows-2019'
     uses: "./.github/workflows/cibldnt.yml"
     with:
-      arch:         'nt'
+      arch:         'x64'
       bldscript:    'ci/buildx.cmd'
       tools:        ${{ matrix.tools }}
       owtools:      ${{ matrix.owtools }}
-      image:        ${{ matrix.image }}
+      image:        'windows-2019'
       owdebug:      ${{ vars.OWDEBUG }}
   workflow-osx:
     needs: start-start
@@ -103,12 +100,14 @@ jobs:
         - owtools:  'CLANG'
           tools:    'clang'
           image:    'macos-latest'
+          arch:     'x64'
         - owtools:  'CLANG'
           tools:    'clang'
           image:    'macos-14'
+          arch:     'a64'
     uses: "./.github/workflows/cibldosx.yml"
     with:
-      arch:         'osx'
+      arch:         ${{ matrix.arch }}
       bldscript:    'ci/buildx.sh'
       tools:        ${{ matrix.tools }}
       owtools:      ${{ matrix.owtools }}
@@ -127,7 +126,7 @@ jobs:
     - name: Load all release files
       uses: "./.github/actions/relload"
       with:
-        arch:       'lnx'
+        hostos:     'lnx'
         gitpath:    'rel'
         tools_nt:   'vs2019'
         tools_lnx:  'gcc'
@@ -136,7 +135,7 @@ jobs:
       id: owsnapshot
       uses: "./.github/actions/snapshot"
       with:
-        arch:       'lnx'
+        hostos:     'lnx'
         gitpath:    'rel'
         owdebug:    ${{ vars.OWDEBUG }}
     - if: github.event_name == 'PullRequest'
@@ -157,7 +156,7 @@ jobs:
       name: Upload Last CI Build
       uses: "./.github/actions/lastbld"
       with:
-        arch:       'lnx'
+        hostos:     'lnx'
         tools:      'gcc'
         fullname:   ${{ steps.owsnapshot.outputs.fullname }}
         owdebug:    ${{ vars.OWDEBUG }}
diff --git a/.github/workflows/cibldlnx.yml b/.github/workflows/cibldlnx.yml
index 856c2d4df2..29928da5b0 100644
--- a/.github/workflows/cibldlnx.yml
+++ b/.github/workflows/cibldlnx.yml
@@ -31,7 +31,8 @@ jobs:
     - name: Bootstrap
       uses: "./.github/actions/boot"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'lnx'
+        suffix:     'lnx-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
@@ -47,7 +48,8 @@ jobs:
     - name: Build
       uses: "./.github/actions/build"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'lnx'
+        suffix:     'lnx-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
@@ -62,6 +64,7 @@ jobs:
     - name: Tests
       uses: "./.github/actions/tests"
       with:
+        hostos:     'lnx'
         arch:       ${{ inputs.arch }}
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
@@ -75,14 +78,15 @@ jobs:
     - name: Load Artifact
       uses: "./.github/actions/artfload"
       with:
-        arch:     ${{ inputs.arch }}
+        hostos:   'lnx'
         gitpath:  'rel'
-        artifact: "rel ${{ inputs.arch }}"
+        artifact: "rel lnx-${{ inputs.arch }}"
         tools:    ${{ inputs.tools }}
         owdebug:  ${{ inputs.owdebug }}
     - name: Test Bootstrap
       uses: "./.github/actions/testboot"
       with:
+        hostos:     'lnx'
         arch:       ${{ inputs.arch }}
         gitpath:    'rel'
         bldscript:  ${{ inputs.bldscript }}
diff --git a/.github/workflows/cibldnt.yml b/.github/workflows/cibldnt.yml
index 1f63acfe91..85e4578a7d 100644
--- a/.github/workflows/cibldnt.yml
+++ b/.github/workflows/cibldnt.yml
@@ -31,7 +31,8 @@ jobs:
     - name: Bootstrap
       uses: "./.github/actions/boot"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'nt'
+        suffix:     'nt-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
@@ -47,7 +48,8 @@ jobs:
     - name: Build
       uses: "./.github/actions/build"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'nt'
+        suffix:     'nt-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
@@ -79,7 +81,8 @@ jobs:
       uses: "./.github/actions/docbuild"
       with:
         target:     ${{ matrix.doctype }}
-        arch:       ${{ inputs.arch }}
+        hostos:     'nt'
+        suffix:     'nt-${{ inputs.arch }}'
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
         owdebug:    ${{ inputs.owdebug }}
@@ -93,6 +96,7 @@ jobs:
     - name: Tests
       uses: "./.github/actions/tests"
       with:
+        hostos:     'nt'
         arch:       ${{ inputs.arch }}
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
@@ -106,14 +110,15 @@ jobs:
     - name: Load Artifact
       uses: "./.github/actions/artfload"
       with:
-        arch:     ${{ inputs.arch }}
+        hostos:   'nt'
         gitpath:  'rel'
-        artifact: "rel ${{ inputs.arch }}"
+        artifact: "rel nt-${{ inputs.arch }}"
         tools:    ${{ inputs.tools }}
         owdebug:  ${{ inputs.owdebug }}
     - name: Test Bootstrap
       uses: "./.github/actions/testboot"
       with:
+        hostos:     'nt'
         arch:       ${{ inputs.arch }}
         gitpath:    'rel'
         bldscript:  ${{ inputs.bldscript }}
diff --git a/.github/workflows/cibldosx.yml b/.github/workflows/cibldosx.yml
index a9ee45f185..6a5f422693 100644
--- a/.github/workflows/cibldosx.yml
+++ b/.github/workflows/cibldosx.yml
@@ -31,7 +31,8 @@ jobs:
     - name: Bootstrap
       uses: "./.github/actions/boot"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'osx'
+        suffix:     'osx-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
@@ -47,7 +48,8 @@ jobs:
     - name: Build
       uses: "./.github/actions/build"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'osx'
+        suffix:     'osx-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 51ebe25e3e..4037113162 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Install DOSBOX
       uses: "./.github/actions/dosboxin"
       with:
-        arch:       'lnx'
+        hostos:     'lnx'
     - name: Setup curl options
       id: curlcmd
       uses: "./.github/actions/curlcmd"
@@ -60,7 +60,7 @@ jobs:
     - name: "Restore Coverity Tools"
       uses: "./.github/actions/tarload"
       with:
-        arch:       'lnx'
+        hostos:     'lnx'
         fullname:   ${{ env.OWCOV_TOOLS_ARCHIVE }}
         gitpath:    ${{ env.OWCOV_TOOLS_GITPATH }}
         format:     'gzip'
@@ -160,7 +160,7 @@ jobs:
 #    - name: Install DOSBOX
 #      uses: "./.github/actions/dosboxin"
 #      with:
-#        arch:       'nt'
+#        hostos:     'nt'
 #    - name: Setup curl options
 #      id: curlcmd
 #      uses: "./.github/actions/curlcmd"
@@ -177,7 +177,7 @@ jobs:
 #    - name: "Restore Coverity Tools"
 #      uses: "./.github/actions/tarload"
 #      with:
-#        arch:       'nt'
+#        hostos:     'nt'
 #        fullname:   ${{ env.OWCOV_TOOLS_ARCHIVE }}
 #        gitpath:    ${{ env.OWCOV_TOOLS_GITPATH }}
 #        format:     'gzip'
@@ -217,7 +217,7 @@ jobs:
 #    - name: "Archive Coverity output data"
 #      uses: "./.github/actions/tarsave"
 #      with:
-#        arch:       'nt'
+#        hostos:     'nt'
 #        fullname:   ${{ steps.tarname.outputs.fullname }}
 #        gitpath:    ${{ env.OWCOV_RESULTS_GITPATH }}
 #        format:     'gzip'
diff --git a/.github/workflows/rel-lnx.yml b/.github/workflows/rel-lnx.yml
index 4bbf0be998..d33f14dbd9 100644
--- a/.github/workflows/rel-lnx.yml
+++ b/.github/workflows/rel-lnx.yml
@@ -31,7 +31,8 @@ jobs:
     - name: Bootstrap Linux
       uses: "./.github/actions/boot"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'lnx'
+        suffix:     'lnx-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
@@ -47,7 +48,8 @@ jobs:
     - name: Build
       uses: "./.github/actions/build"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'lnx'
+        suffix:     'lnx-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
@@ -62,6 +64,7 @@ jobs:
     - name: Tests
       uses: "./.github/actions/tests"
       with:
+        hostos:     'lnx'
         arch:       ${{ inputs.arch }}
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
diff --git a/.github/workflows/rel-nt.yml b/.github/workflows/rel-nt.yml
index 8c92019e8b..e69994d01c 100644
--- a/.github/workflows/rel-nt.yml
+++ b/.github/workflows/rel-nt.yml
@@ -31,7 +31,8 @@ jobs:
     - name: Bootstrap
       uses: "./.github/actions/boot"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'nt'
+        suffix:     'nt-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
@@ -47,7 +48,8 @@ jobs:
     - name: Build
       uses: "./.github/actions/build"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'nt'
+        suffix:     'nt-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
@@ -79,7 +81,8 @@ jobs:
       uses: "./.github/actions/docbuild"
       with:
         target:     ${{ matrix.doctype }}
-        arch:       ${{ inputs.arch }}
+        hostos:     'nt'
+        suffix:     'nt-${{ inputs.arch }}'
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
         owdebug:    ${{ inputs.owdebug }}
@@ -93,6 +96,7 @@ jobs:
     - name: Tests
       uses: "./.github/actions/tests"
       with:
+        hostos:     'nt'
         arch:       ${{ inputs.arch }}
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
diff --git a/.github/workflows/rel-osx.yml b/.github/workflows/rel-osx.yml
index f777d29922..4e0abe7abe 100644
--- a/.github/workflows/rel-osx.yml
+++ b/.github/workflows/rel-osx.yml
@@ -31,7 +31,8 @@ jobs:
     - name: Bootstrap
       uses: "./.github/actions/boot"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'osx'
+        suffix:     'osx-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
@@ -47,7 +48,8 @@ jobs:
     - name: Build
       uses: "./.github/actions/build"
       with:
-        arch:       ${{ inputs.arch }}
+        hostos:     'osx'
+        suffix:     'osx-${{ inputs.arch }}'
         bldscript:  ${{ inputs.bldscript }}
         tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 57ddbb24bb..b0f1b629b8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,7 +35,6 @@ jobs:
           image:   'ubuntu-20.04'
     uses: "./.github/workflows/rel-lnx.yml"
     with:
-      arch:         'lnx'
       bldscript:    'ci/buildx.sh'
       tools:        ${{ matrix.tools }}
       owtools:      ${{ matrix.owtools }}
@@ -53,7 +52,6 @@ jobs:
           image:   'windows-2019'
     uses: "./.github/workflows/rel-nt.yml"
     with:
-      arch:         'nt'
       bldscript:    'ci/buildx.cmd'
       tools:        ${{ matrix.tools }}
       owtools:      ${{ matrix.owtools }}
@@ -71,7 +69,6 @@ jobs:
 #          image:   'macos-11'
 #    uses: "./.github/workflows/rel-osx.yml"
 #    with:
-#      arch:         'osx'
 #      bldscript:    'ci/buildx.sh'
 #      tools:        ${{ matrix.tools }}
 #      owtools:      ${{ matrix.owtools }}
@@ -110,7 +107,7 @@ jobs:
       uses: "./.github/actions/install"
       with:
         target:     ${{ matrix.insttype }}
-        arch:       'lnx'
+        hostos:     'lnx'
         tools_nt:   'vs2019'
         tools_lnx:  'gcc'
         owtools:    'GCC'
@@ -130,7 +127,7 @@ jobs:
       id: rel_rel
       uses: "./.github/actions/release"
       with:
-        arch:    'lnx'
+        hostos:  'lnx'
         tools:   'gcc'
         owdebug: ${{ vars.OWDEBUG }}
         owcurlopts: ${{ vars.OWCURLOPTS }}
@@ -170,7 +167,7 @@ jobs:
         target:     ${{ matrix.asset }}
         drelid:     ${{ needs.release.outputs.drelid }}
         mrelid:     ${{ needs.release.outputs.mrelid }}
-        arch:       'lnx'
+        hostos:     'lnx'
         owdebug:    ${{ vars.OWDEBUG }}
         owcurlopts: ${{ vars.OWCURLOPTS }}
   end-end:
diff --git a/.github/workflows/wikidocs.yml b/.github/workflows/wikidocs.yml
index 0246c3784c..aab22d08d6 100644
--- a/.github/workflows/wikidocs.yml
+++ b/.github/workflows/wikidocs.yml
@@ -51,7 +51,8 @@ jobs:
     - name: Bootstrap
       uses: "./.github/actions/boot"
       with:
-        arch:           'nt'
+        hostos:         'nt'
+        suffix:         'nt-x64'
         bldscript:      'ci\buildx.cmd'
         tools:          'vs2019'
         owtools:        'VISUALC'
@@ -81,7 +82,8 @@ jobs:
         target:     ${{ matrix.doctype }}
         gitpath:    'docs wiki'
         owtarget:   ${{ matrix.owtarget }}
-        arch:       'nt'
+        hostos:     'nt'
+        suffix:     'nt-x64'
         tools:      'vs2019'
         owtools:    'VISUALC'
         owdebug:    ${{ vars.OWDEBUG }}