deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 12:21:35 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/GAM-team/GAM

Browse Source
This commit is contained in:
Jay Lee
2022-05-27 15:03:47 +00:00
parent a49124d1d0 3087b4b776
commit f9786468db
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
.github/workflows/build.yml vendored
View File

@@ -24,26 +24,16 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- os: ubuntu-20.04 - os: ubuntu-22.04
jid: 1 jid: 1
goal: build goal: build
arch: x86_64 arch: x86_64
openssl_archs: linux-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] - os: [self-hosted, linux, arm64]
jid: 2 jid: 2
goal: build goal: build
arch: aarch64 arch: aarch64
openssl_archs: linux-aarch64 openssl_archs: linux-aarch64
- os: [self-hosted, linux, arm]
jid: 3
goal: build
arch: armv7l
openssl_archs: linux-armv4
- os: macos-12 - os: macos-12
jid: 4 jid: 4
goal: build goal: build
@@ -92,7 +82,7 @@ jobs:
with: with:
path: | path: |
bin bin
key: gam-${{ matrix.jid }}-20220517 key: gam-${{ matrix.jid }}-20220525
- name: Use pre-compiled Python for testing - name: Use pre-compiled Python for testing
if: matrix.python != '' if: matrix.python != ''
@@ -485,7 +475,16 @@ jobs:
- name: Linux 64-bit Make Static - name: Linux 64-bit Make Static
if: runner.os == 'Linux' && contains(runner.arch, '64') && matrix.goal != 'test' if: runner.os == 'Linux' && contains(runner.arch, '64') && matrix.goal != 'test'
run: | run: |
$PYTHON -m staticx "${gam}" "${gam}-staticx" case $RUNNER_ARCH in
X64)
ldlib=/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2
;;
ARM64)
ldlib=/lib/aarch64-linux-gnu/ld-linux-aarch64.so.1
;;
esac
echo "ldlib=${ldlib}"
$PYTHON -m staticx -l "${ldlib}" "${gam}" "${gam}-staticx"
- name: Linux Run StaticX-ed - name: Linux Run StaticX-ed
if: runner.os == 'Linux' && contains(runner.arch, '64') && matrix.goal != 'test' if: runner.os == 'Linux' && contains(runner.arch, '64') && matrix.goal != 'test'

1
src/gam/gapi/errors.py
View File

@@ -233,6 +233,7 @@ ERROR_REASON_TO_EXCEPTION = {
OAUTH2_TOKEN_ERRORS = [ OAUTH2_TOKEN_ERRORS = [
'access_denied', 'access_denied',
'access_denied: Requested client not authorized', 'access_denied: Requested client not authorized',
'access_denied: Account restricted',
'internal_failure: Backend Error', 'internal_failure: Backend Error',
'internal_failure: None', 'internal_failure: None',
'invalid_grant', 'invalid_grant',

2
src/gam/var.py
View File

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

2
src/setup.cfg
View File

@@ -1,6 +1,6 @@
[metadata] [metadata]
name = GAM for Google Workspace name = GAM for Google Workspace
version = 6.0.21 version = 6.0.22
description = Command line management for Google Workspaces description = Command line management for Google Workspaces
long_description = file: readme.md long_description = file: readme.md
long_description_content_type = text/markdown long_description_content_type = text/markdown