From 441c09ab35195b35a46655b54c78c8b7b78afcda Mon Sep 17 00:00:00 2001 From: Rye Date: Tue, 19 Nov 2024 03:35:01 -0500 Subject: [PATCH 1/4] Switch default build-variables ref to universal for macos arm64 support and fix repo checkout bool check --- action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/action.yaml b/action.yaml index d65a225..138afa7 100644 --- a/action.yaml +++ b/action.yaml @@ -38,7 +38,7 @@ inputs: build-variables-ref: type: string description: build-variables repository ref - default: viewer + default: universal build-id: type: string description: "Built id (default: commit sha)" @@ -96,7 +96,7 @@ runs: - name: Checkout uses: actions/checkout@v4 - if: inputs.checkout + if: ${{ fromJSON(inputs.checkout) }} with: # Work around the fact that in the context of a pull request github.sha # references a dynamic merge commit rather than the branch head From e0522c7ff001c41bdd482711f9bfc852b9269315 Mon Sep 17 00:00:00 2001 From: Rye Date: Fri, 21 Feb 2025 12:34:12 -0500 Subject: [PATCH 2/4] Update workflow files to target Alchemy workflows --- .github/workflows/release.yaml | 2 +- .github/workflows/test.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5ec0fa7..63b85ac 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -6,4 +6,4 @@ on: jobs: Tag: - uses: secondlife/update-major-tag-workflow/.github/workflows/update-major-tag.yaml@v1 + uses: AlchemyViewer/update-major-tag-workflow/.github/workflows/update-major-tag.yaml@v1 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 29f257e..ce7446f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -61,14 +61,14 @@ jobs: # Test custom python version - uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.13" - uses: ./ with: - artifact-name: autobuild-py310-${{ matrix.os }} + artifact-name: autobuild-py313-${{ matrix.os }} setup-python: false - name: Check python version shell: bash run: | ver="$(python --version)" - [[ "$ver" == "Python 3.10."* ]] || exit "Expected python 3.10, got $ver" + [[ "$ver" == "Python 3.13."* ]] || exit "Expected python 3.13, got $ver" From ea75f5b05426243505baaeeabaa650812b94b2fd Mon Sep 17 00:00:00 2001 From: Rye Date: Fri, 21 Feb 2025 12:34:25 -0500 Subject: [PATCH 3/4] Update pre-commit hooks to 5.0.0 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 743e264..50fbee3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v5.0.0 hooks: # Fix the last lines' trailing whitespace before correcting that they exist. - id: trailing-whitespace From 83d3b5c6ad3ba43a99b6aa5c8b4f4d8a4cb53f26 Mon Sep 17 00:00:00 2001 From: Rye Date: Fri, 21 Feb 2025 12:39:35 -0500 Subject: [PATCH 4/4] Update action to target Alchemy build-variables and misc cleanup --- LICENSE | 1 + README.md | 4 ++-- action.yaml | 55 ++++------------------------------------------------- 3 files changed, 7 insertions(+), 53 deletions(-) diff --git a/LICENSE b/LICENSE index 46f0b46..44c0271 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ Copyright 2022 Linden Research, Inc. +Copyright 2025 Rye Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index 638c26c..21bb6fe 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,10 @@ jobs: build: strategy: matrix: - os: [windows-2019, macos-11, ubuntu-latest] + os: [windows-2022, macos-15, ubuntu-22.04] runs-on: ${{ matrix.os }} steps: - - uses: secondlife/action-autobuild@v3 + - uses: secondlife/action-autobuild@v5 with: autobuild-version: 3.9.0 # PyPI version or git ref ``` diff --git a/action.yaml b/action.yaml index 9c565cd..4e82ed5 100644 --- a/action.yaml +++ b/action.yaml @@ -24,7 +24,7 @@ inputs: default: true setup-autobuild: type: boolean - description: Install autobuild using secondlife/setup-autobuild + description: Install autobuild from pip default: true configure-args: type: string @@ -42,14 +42,14 @@ inputs: build-variables-repo: type: string description: build-variables repository - default: secondlife/build-variables + default: AlchemyViewer/build-variables build-variables-ref: type: string description: build-variables repository ref - default: universal + default: main build-id: type: string - description: "Built id (default: commit sha)" + description: "Build id (default: commit sha)" default: SHA file: type: string @@ -80,19 +80,6 @@ inputs: artifact-name: type: string description: Name of artifact to upload, defaults to the autobuild package name - setup-macos-codesign: - type: boolean - description: Enable apple code signing for artifacts - default: false - macos-p12-base64: - description: The certificates in a PKCS12 file encoded as a base64 string. - macos-p12-password: - description: The password used to import the PKCS12 file. - macos-p12-id: - description: The PKCS12 identifier. - macos-cert-id: - type: string - description: Name of artifact to upload, defaults to the autobuild package name shallow: type: boolean description: Use shallow clone @@ -190,45 +177,11 @@ runs: sudo apt-get update sudo apt-get -y install ${{ inputs.apt-packages }} - - name: Select Xcode 16.0 - if: ${{ runner.os == 'macOS' }} - shell: bash - run: sudo xcode-select -s /Applications/Xcode_16.0.app/Contents/Developer - - name: Setup Homebrew Packages if: ${{ runner.os == 'macOS' && inputs.brew-packages }} shell: bash run: brew install ${{ inputs.brew-packages }} - - name: Set up macOS code signing - id: mac-keychain - if: ${{ runner.os == 'macOS' && fromJSON(inputs.setup-macos-codesign) && inputs.macos-p12-base64 && inputs.macos-p12-password }} - env: - BUILD_CERTIFICATE_BASE64: ${{ inputs.macos-p12-base64 }} - BUILD_CERTIFICATE_PASSWORD: ${{ inputs.macos-p12-password }} - shell: bash - run: | - # create variables - CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 - KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db - KEYCHAIN_PASSWORD=$(openssl rand -hex 32) - echo "::add-mask::$KEYCHAIN_PASSWORD" - - # import certificate and provisioning profile from secrets - echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH > /dev/null 2>&1 - - # create temporary keychain - security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH > /dev/null 2>&1 - security set-keychain-settings -lut 21600 $KEYCHAIN_PATH > /dev/null 2>&1 - security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH > /dev/null 2>&1 - - # import certificate to keychain - security import $CERTIFICATE_PATH -P "$BUILD_CERTIFICATE_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH > /dev/null 2>&1 - security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH > /dev/null 2>&1 - security list-keychain -d user -s $KEYCHAIN_PATH > /dev/null 2>&1 - - echo "keychain-path=${KEYCHAIN_PATH}" >> $GITHUB_OUTPUT - - name: Cache installables uses: actions/cache@v4 id: cache-installables