diff --git a/.github/actions/pandemonium-build/action.yml b/.github/actions/pandemonium-build/action.yml index 6cdb1c661..ab0d6c3f3 100644 --- a/.github/actions/pandemonium-build/action.yml +++ b/.github/actions/pandemonium-build/action.yml @@ -20,7 +20,9 @@ inputs: default: "${{ github.workspace }}/.scons-cache/" scons-cache-limit: description: The scons cache size limit. - default: 4096 + # actions/cache has 10 GiB limit, and GitHub runners have a 14 GiB disk. + # Limit to 7 GiB to avoid having the extracted cache fill the disk. + default: 7168 runs: using: "composite" steps: diff --git a/.github/actions/pandemonium-cache/action.yml b/.github/actions/pandemonium-cache/action.yml index 584ec936f..4a30dc6d4 100644 --- a/.github/actions/pandemonium-cache/action.yml +++ b/.github/actions/pandemonium-cache/action.yml @@ -12,7 +12,7 @@ runs: steps: # Upload cache on completion and check it out now - name: Load .scons_cache directory - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{inputs.scons-cache}} key: ${{inputs.cache-name}}-${{env.PANDEMONIUM_BASE_BRANCH}}-${{github.ref}}-${{github.sha}} diff --git a/.github/actions/pandemonium-deps/action.yml b/.github/actions/pandemonium-deps/action.yml index ee4d7d375..bb0c96821 100644 --- a/.github/actions/pandemonium-deps/action.yml +++ b/.github/actions/pandemonium-deps/action.yml @@ -12,7 +12,7 @@ runs: steps: # Use python 3.x release (works cross platform) - name: Set up Python 3.x - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: # Semantic version range syntax or exact version of a Python version python-version: ${{ inputs.python-version }} diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml index e00a5f28c..f0919380d 100644 --- a/.github/actions/upload-artifact/action.yml +++ b/.github/actions/upload-artifact/action.yml @@ -12,7 +12,7 @@ runs: using: "composite" steps: - name: Upload Pandemonium Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{ inputs.name }} path: ${{ inputs.path }} diff --git a/.github/disabled_workflows/android_editor_builds.yml b/.github/disabled_workflows/android_editor_builds.yml index a2fc176dd..07e699373 100644 --- a/.github/disabled_workflows/android_editor_builds.yml +++ b/.github/disabled_workflows/android_editor_builds.yml @@ -17,7 +17,7 @@ jobs: name: Android Editor (target=release_debug, tools=yes) steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Azure repositories are not reliable, we need to prevent azure giving us packages. - name: Make apt sources.list use the default Ubuntu repositories @@ -27,8 +27,9 @@ jobs: sudo apt-get update - name: Set up Java 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: temurin java-version: 11 - name: Setup Pandemonium build cache diff --git a/.github/disabled_workflows/static_checks.yml b/.github/disabled_workflows/static_checks.yml index ccb37f385..f9650964e 100644 --- a/.github/disabled_workflows/static_checks.yml +++ b/.github/disabled_workflows/static_checks.yml @@ -1,13 +1,17 @@ name: 📊 Static Checks on: [push, pull_request] +concurrency: + group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-static + cancel-in-progress: true + jobs: static-checks: name: Static Checks (clang-format, black format, file format, documentation checks) runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Azure repositories are not reliable, we need to prevent Azure giving us packages. - name: Make apt sources.list use the default Ubuntu repositories @@ -23,7 +27,7 @@ jobs: sudo apt-get install -qq dos2unix recode clang-format-13 sudo update-alternatives --remove-all clang-format sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-13 100 - sudo pip3 install black==21.10b0 pygments + sudo pip3 install black==22.3.0 pygments - name: File formatting checks (file_format.sh) run: | @@ -47,3 +51,7 @@ jobs: - name: Documentation checks run: | doc/tools/make_rst.py --dry-run doc/classes modules + + - name: Style checks via clang-format (clang_format.sh) + run: | + bash ./misc/scripts/clang_format.sh diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml index 08fead991..a0c622741 100644 --- a/.github/workflows/android_builds.yml +++ b/.github/workflows/android_builds.yml @@ -17,7 +17,7 @@ jobs: name: Template (target=release, tools=no) steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Azure repositories are not reliable, we need to prevent azure giving us packages. - name: Make apt sources.list use the default Ubuntu repositories @@ -27,8 +27,9 @@ jobs: sudo apt-get update - name: Set up Java 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: temurin java-version: 11 - name: Setup Pandemonium build cache diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml index ea4434114..a489eeece 100644 --- a/.github/workflows/ios_builds.yml +++ b/.github/workflows/ios_builds.yml @@ -16,7 +16,7 @@ jobs: name: Template (target=release, tools=no) steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Pandemonium build cache uses: ./.github/actions/pandemonium-cache @@ -25,7 +25,7 @@ jobs: - name: Setup python and scons uses: ./.github/actions/pandemonium-deps - - name: Compilation (armv7) + - name: Compilation (arm64v8) uses: ./.github/actions/pandemonium-build with: sconsflags: ${{ env.SCONSFLAGS }} diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index 6170d9b34..aab56a35b 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -33,7 +33,7 @@ jobs: artifact: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Linux dependencies shell: bash @@ -68,6 +68,7 @@ jobs: if: ${{ matrix.artifact }} run: | strip bin/pandemonium.* + chmod +x bin/pandemonium.* - name: Upload artifact uses: ./.github/actions/upload-artifact diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index 867e1badb..f434ccbb9 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -30,7 +30,7 @@ jobs: tools: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Pandemonium build cache uses: ./.github/actions/pandemonium-cache @@ -49,6 +49,11 @@ jobs: target: ${{ matrix.target }} tools: ${{ matrix.tools }} + - name: Prepare artifact + run: | + strip bin/pandemonium.* + chmod +x bin/pandemonium.* + - name: Upload artifact uses: ./.github/actions/upload-artifact with: diff --git a/.github/workflows/server_builds.yml b/.github/workflows/server_builds.yml index ea213168d..8f3a650ee 100644 --- a/.github/workflows/server_builds.yml +++ b/.github/workflows/server_builds.yml @@ -29,7 +29,7 @@ jobs: tools: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Linux dependencies shell: bash diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml index 6b4d7eaca..f5a9b46a5 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -34,7 +34,7 @@ jobs: tools: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Pandemonium build cache uses: ./.github/actions/pandemonium-cache @@ -52,7 +52,10 @@ jobs: platform: windows target: ${{ matrix.target }} tools: ${{ matrix.tools }} - scons-cache-limit: 3072 + + - name: Prepare artifact + run: | + Remove-Item bin/* -Include *.exp,*.lib,*.pdb -Force - name: Upload artifact uses: ./.github/actions/upload-artifact diff --git a/gles_builders.py b/gles_builders.py index c5562b554..721bfdf91 100644 --- a/gles_builders.py +++ b/gles_builders.py @@ -390,7 +390,7 @@ def build_legacygl_header(filename, include, class_suffix, output_attribs, gles2 x = header_data.enums[xv] bits = 1 amt = len(x) - while 2 ** bits < amt: + while 2**bits < amt: bits += 1 strs = "{" for i in range(amt):