Update build.yml

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
             goal: build
             arch: x86_64
             openssl_archs: linux-x86_64
-          - os: [self-hosted, linux, arm64, gcp]
+          - os: [self-hosted, linux, arm64]
             jid: 2
             goal: build
             arch: aarch64
@@ -45,7 +45,7 @@ jobs:
             arch: x86_64
             openssl_archs: linux-x86_64
             staticx: yes
-          - os: [self-hosted, linux, arm64, gcp]
+          - os: [self-hosted, linux, arm64]
             jid: 4
             goal: build
             arch: aarch64
@@ -61,11 +61,11 @@ jobs:
             goal: build
             arch: Win64
             openssl_archs: VC-WIN64A
-          - os: windows-2022
-            jid: 7
-            goal: build
-            arch: Win32
-            openssl_archs: VC-WIN32
+
+
+
+
+
           - os: ubuntu-22.04
             goal: test
             python: "3.8"
@@ -83,7 +83,7 @@ jobs:
             arch: x86_64
           - os: ubuntu-22.04
             goal: test
-            python: "3.12.0-alpha - 3.12"
+            python: "3.12"
             jid: 12
             arch: x86_64
 
@@ -109,7 +109,7 @@ jobs:
           path: |
             bin.tar.xz
             src/cpython
-          key: gam-${{ matrix.jid }}-20230417
+          key: gam-${{ matrix.jid }}-20230608
 
       - name: Untar Cache archive
         if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true'
@@ -122,6 +122,7 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
+          allow-prereleases: true
 
       - name: Set cURL retry flag
         run: |
@@ -467,8 +468,6 @@ jobs:
           git clone https://github.com/pyinstaller/pyinstaller.git
           cd pyinstaller
           export latest_release=$(git tag --list | grep -v dev | grep -v rc | sort -Vr | head -n1)
-
-
           git checkout "${latest_release}"
           # remove pre-compiled bootloaders so we fail if bootloader compile fails
           rm -rvf PyInstaller/bootloader/*-*/*

src/gam.spec

@@ -7,22 +7,23 @@ from PyInstaller.utils.hooks import copy_metadata
 
 from gam.var import GAM_VER_LIBS
 
-extra_files = []
+datas = []
 for pkg in GAM_VER_LIBS:
-    extra_files += copy_metadata(pkg, recursive=True)
-extra_files += [('cbcm-v1.1beta1.json', '.')]
-extra_files += [('contactdelegation-v1.json', '.')]
-extra_files += [('admin-directory_v1.1beta1.json', '.')]
-extra_files += [('roots.pem', '.')]
-hidden_imports = [
+    datas += copy_metadata(pkg, recursive=True)
+datas += [('cbcm-v1.1beta1.json', '.')]
+datas += [('contactdelegation-v1.json', '.')]
+datas += [('admin-directory_v1.1beta1.json', '.')]
+datas += [('roots.pem', '.')]
+hiddenimports = [
      'gam.auth.yubikey',
      ]
+
 a = Analysis(
     ['gam/__main__.py'],
     pathex=[],
     binaries=[],
-    datas=extra_files,
-    hiddenimports=hidden_imports,
+    datas=datas,
+    hiddenimports=hiddenimports,
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],

src/gam/gapi/chromepolicy.py

@@ -70,7 +70,7 @@ def printshow_policies():
         body['policyTargetKey']['additionalTargetKeys'] = {'app_id': app_id}
         if not namespaces:
             namespaces = ['chrome.users.apps',
-                          'chrome.devices.managedGuest.apps',
+                          'chrome.devices.managedguest.apps',
                           'chrome.devices.kiosk.apps']
     elif not namespaces:
         namespaces = [
@@ -78,7 +78,7 @@ def printshow_policies():
             'chrome.users.apps',
             'chrome.devices',
             'chrome.devices.kiosk',
-            'chrome.devices.managedGuest',
+            'chrome.devices.managedguest',
             ]
     throw_reasons = [gapi_errors.ErrorReason.FOUR_O_O,]
     orgunitPath = gapi_directory_orgunits.orgunit_from_orgunitid(orgunit[9:], None)

src/gam/gapi/licensing.py

@@ -204,6 +204,7 @@ def print_(returnFields=None,
                     ],
                     page_message=page_message,
                     customerId=customer_id,
+                    maxResults=100,
                     productId=product,
                     skuId=sku,
                     fields=fields)
@@ -234,6 +235,7 @@ def print_(returnFields=None,
                     ],
                     page_message=page_message,
                     customerId=customer_id,
+                    maxResults=100,
                     productId=productId,
                     fields=fields)
                 if countsOnly:

src/gam/var.py

@@ -8,7 +8,7 @@ import platform
 import re
 
 GAM_AUTHOR = 'Jay Lee <jay0lee@gmail.com>'
-GAM_VERSION = '6.57'
+GAM_VERSION = '6.58'
 GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 GAM_URL = 'https://jaylee.us/gam'