diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30237ba3..674a3e12 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,7 +114,7 @@ jobs: with: path: | cache.tar.xz - key: gam-${{ matrix.jid }}-20240604 + key: gam-${{ matrix.jid }}-20240606 - name: Untar Cache archive if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' @@ -257,7 +257,11 @@ jobs: cd "${GITHUB_WORKSPACE}/src" git clone https://github.com/openssl/openssl.git cd "${OPENSSL_SOURCE_PATH}" - export LATEST_STABLE_TAG=$(git tag --list openssl-* | grep -v alpha | grep -v beta | sort -Vr | head -n1) + if ([ "${RUNNER_OS}" == "macOS" ] && [ "$arch" == "x86_64" ]); then + export LATEST_STABLE_TAG="openssl-3.3.0" + else + export LATEST_STABLE_TAG=$(git tag --list openssl-* | grep -v alpha | grep -v beta | sort -Vr | head -n1) + fi echo "Checking out version ${LATEST_STABLE_TAG}" git checkout "${LATEST_STABLE_TAG}" export COMPILED_OPENSSL_VERSION=${LATEST_STABLE_TAG:8} # Trim the openssl- prefix diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index a229a43a..d04a16fd 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -24,6 +24,8 @@ ERROR: 500: unknownError - Unknown Error. ERROR: 503: serviceNotAvailable - The service is currently unavailable. ``` +Upgraded to OpenSSL 3.3.1 where possible. + 6.76.12 Fixed bug in `gam print|show chatspaces` that caused the following error: diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 63efa81a..3a27ea14 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -53941,7 +53941,7 @@ def printFileList(users): pageMessage=pageMessage, noFinalize=True, throwReasons=GAPI.DRIVE_USER_THROW_REASONS+[GAPI.INVALID_QUERY, GAPI.INVALID, GAPI.BAD_REQUEST], - retryReasons=[GAPI.UNKNOWN_ERROR], + retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS+[GAPI.UNKNOWN_ERROR], q=q, orderBy=DFF.orderBy, includeLabels=includeLabels, fields=pagesFields, pageSize=GC.Values[GC.DRIVE_MAX_RESULTS], includeItemsFromAllDrives=True, supportsAllDrives=True) for childEntryInfo in children: @@ -54253,7 +54253,7 @@ def printFileList(users): throwReasons=GAPI.DRIVE_USER_THROW_REASONS+[GAPI.INVALID_QUERY, GAPI.INVALID, GAPI.BAD_REQUEST, GAPI.FILE_NOT_FOUND, GAPI.NOT_FOUND, GAPI.TEAMDRIVE_MEMBERSHIP_REQUIRED], - retryReasons=[GAPI.UNKNOWN_ERROR], + retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS+[GAPI.UNKNOWN_ERROR], q=DLP.fileIdEntity['query'], orderBy=DFF.orderBy, includeLabels=includeLabels, fields=pagesFields, pageSize=GC.Values[GC.DRIVE_MAX_RESULTS], **btkwargs) for files in feed: