From 3e556425ecb138751f00fca2999db6b894c71d41 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Wed, 25 May 2022 13:29:18 -0700 Subject: [PATCH 1/8] New Oauth2 error message (#1524) --- src/gam/gapi/errors.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gam/gapi/errors.py b/src/gam/gapi/errors.py index 9a5c794c..d4765af2 100644 --- a/src/gam/gapi/errors.py +++ b/src/gam/gapi/errors.py @@ -233,6 +233,7 @@ ERROR_REASON_TO_EXCEPTION = { OAUTH2_TOKEN_ERRORS = [ 'access_denied', 'access_denied: Requested client not authorized', + 'access_denied: Account restricted', 'internal_failure: Backend Error', 'internal_failure: None', 'invalid_grant', From 5d618de296b386341c35aebc1c68028fbd1a45f7 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 25 May 2022 17:01:00 -0400 Subject: [PATCH 2/8] Update build.yml --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7adec328..15ccd359 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,11 +39,6 @@ jobs: goal: build arch: aarch64 openssl_archs: linux-aarch64 - - os: [self-hosted, linux, arm] - jid: 3 - goal: build - arch: armv7l - openssl_archs: linux-armv4 - os: macos-12 jid: 4 goal: build From dbfbf61ddcf185031f4e2d5e5050f52c814602d0 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 25 May 2022 19:18:51 -0400 Subject: [PATCH 3/8] Update build.yml --- .github/workflows/build.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15ccd359..76aa6def 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,16 +24,11 @@ jobs: strategy: matrix: include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 jid: 1 goal: build arch: x86_64 openssl_archs: linux-x86_64 - #- os: ubuntu-22.04 - # jid: 11 - # goal: build - # arch: x86_64 - # openssl_archs: linux-x86_64 - os: [self-hosted, linux, arm64] jid: 2 goal: build @@ -87,7 +82,7 @@ jobs: with: path: | bin - key: gam-${{ matrix.jid }}-20220517 + key: gam-${{ matrix.jid }}-20220525 - name: Use pre-compiled Python for testing if: matrix.python != '' From 6fce9416403b3ac0e837bcc309ccb03983a34e26 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 25 May 2022 19:51:13 -0400 Subject: [PATCH 4/8] Update build.yml --- .github/workflows/build.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76aa6def..d8885ab5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -475,7 +475,16 @@ jobs: - name: Linux 64-bit Make Static if: runner.os == 'Linux' && contains(runner.arch, '64') && matrix.goal != 'test' run: | - $PYTHON -m staticx "${gam}" "${gam}-staticx" + case $RUNNER_ARCH in + X64) + ldlib=/lib64/ld-linux-x86-64.so.2 + ;; + ARM64) + ldlib=/lib/ld-linux-aarch64.so.1 + ;; + esac + echo "ldlib=${ldlib}" + $PYTHON -m staticx -l "${ldlib}" "${gam}" "${gam}-staticx" - name: Linux Run StaticX-ed if: runner.os == 'Linux' && contains(runner.arch, '64') && matrix.goal != 'test' From 7b0a8dce1ed1e0b85c42beeb14a7f15cde1ac614 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 25 May 2022 20:32:17 -0400 Subject: [PATCH 5/8] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8885ab5..8ab2b6b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -477,7 +477,7 @@ jobs: run: | case $RUNNER_ARCH in X64) - ldlib=/lib64/ld-linux-x86-64.so.2 + ldlib=/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ;; ARM64) ldlib=/lib/ld-linux-aarch64.so.1 From 30a571f56c5e7dd7bc9ba754f9c1dd1a911f9573 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 25 May 2022 21:39:15 -0400 Subject: [PATCH 6/8] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ab2b6b7..3227755e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -480,7 +480,7 @@ jobs: ldlib=/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ;; ARM64) - ldlib=/lib/ld-linux-aarch64.so.1 + ldlib=/lib/aarch64-linux-gnu/ld-linux-aarch64.so.1 ;; esac echo "ldlib=${ldlib}" From aa595fe623f2d7a3d3781bfc27b230975b4bd356 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Thu, 26 May 2022 08:54:27 -0400 Subject: [PATCH 7/8] Update var.py --- src/gam/var.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gam/var.py b/src/gam/var.py index e4bfedc6..4f550e9b 100644 --- a/src/gam/var.py +++ b/src/gam/var.py @@ -8,7 +8,7 @@ import platform import re GAM_AUTHOR = 'Jay Lee ' -GAM_VERSION = '6.21' +GAM_VERSION = '6.22' GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' GAM_URL = 'https://jaylee.us/gam' From 3087b4b7764b0d859c8b29cc18c0ad29c628c6fa Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Thu, 26 May 2022 06:58:22 -0700 Subject: [PATCH 8/8] Update pip version (#1525) --- src/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/setup.cfg b/src/setup.cfg index dd4030b0..b77be5db 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = GAM for Google Workspace -version = 6.0.21 +version = 6.0.22 description = Command line management for Google Workspaces long_description = file: readme.md long_description_content_type = text/markdown