diff --git a/.github/actions/get-commit-msg/action.yml b/.github/actions/get-commit-msg/action.yml index 6aa41c8ea5..88e20ec84d 100644 --- a/.github/actions/get-commit-msg/action.yml +++ b/.github/actions/get-commit-msg/action.yml @@ -1,43 +1,53 @@ +# This action retrieves the latest commit message from a push or pull_request event +# and makes it available as an output variable named 'msg'. name: 'Get commit message' outputs: msg: value: ${{ steps.action_output.outputs.msg }} + hash: + value: ${{ steps.action_output.outputs.hash }} runs: using: "composite" steps: - name: Find commit message (on push) if: github.event_name == 'push' shell: bash + env: + COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | AUTHOR_NAME="${{ github.event.head_commit.author.name }}" AUTHOR_EMAIL="${{ github.event.head_commit.author.email }}" TSTAMP="${{ github.event.head_commit.timestamp }}" - echo "commit ${{ github.event.head_commit.id }}" >> /tmp/commit_msg.txt + HASH="${{ github.event.head_commit.id }}" + echo "commit $HASH" >> /tmp/commit_msg.txt echo "Author: ${AUTHOR_NAME}<${AUTHOR_EMAIL}>" >> /tmp/commit_msg.txt echo "Date: ${TSTAMP}" >> /tmp/commit_msg.txt echo "" >> /tmp/commit_msg.txt - echo "${{ github.event.head_commit.message }}" >> /tmp/commit_msg.txt + echo "$COMMIT_MESSAGE" >> /tmp/commit_msg.txt + echo "$HASH" > /tmp/commit_hash.txt - name: Find commit message (PR) shell: bash id: checkout_code if: github.event_name == 'pull_request' run: | - echo "+++++ head commit message +++++" - echo "$(git log -1 --no-merges)" - echo "+++++++++++++++++++++++++++++++" - echo "hash=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" - git checkout ${{ github.event.pull_request.head.sha }} - echo "$(git log -1 --no-merges)" >> /tmp/commit_msg.txt + BEFORE_HASH=$(git rev-parse HEAD) + echo "hash=$BEFORE_HASH" >> "$GITHUB_OUTPUT" + # Next we will checkout the actual head (not the merge commits) of the PR + AFTER_HASH="${{ github.event.pull_request.head.sha }}" + git checkout $AFTER_HASH + COMMIT_MESSAGE=$(git log -1 --no-merges) + echo "$COMMIT_MESSAGE" > /tmp/commit_msg.txt + echo "$AFTER_HASH" > /tmp/commit_hash.txt - shell: bash id: action_output run: | + # Get the commit message DELIMITER="EOF_FILE_CONTENT_$(date +%s)" # Using timestamp to make it more unique echo "msg<<$DELIMITER" >> "$GITHUB_OUTPUT" cat /tmp/commit_msg.txt >> "$GITHUB_OUTPUT" echo "$DELIMITER" >> "$GITHUB_OUTPUT" - echo "----- got commit message ---" - cat /tmp/commit_msg.txt - echo "----------------------------" + # Get the commit hash + echo "hash=$(cat /tmp/commit_hash.txt)" >> "$GITHUB_OUTPUT" - name: Cleanup Find commit message (PR) shell: bash if: github.event_name == 'pull_request' diff --git a/.github/workflows/postsubmit.yml b/.github/workflows/postsubmit.yml index 9b1f02aa14..e3e4c36d89 100644 --- a/.github/workflows/postsubmit.yml +++ b/.github/workflows/postsubmit.yml @@ -23,7 +23,7 @@ jobs: GH_TOKEN: ${{ secrets.FILAMENTBOT_TOKEN }} run: | GOLDEN_BRANCH=$(echo "${{ steps.get_commit_msg.outputs.msg }}" | python3 test/renderdiff/src/commit_msg.py) - COMMIT_HASH=$(echo "${{ steps.get_commit_msg.outputs.msg }}" | head -n 1 | sed "s/commit //g") + COMMIT_HASH="${{ steps.get_commit_msg.outputs.hash }}" if [[ "${GOLDEN_BRANCH}" != "main" ]]; then git config --global user.email "filament.bot@gmail.com" git config --global user.name "Filament Bot" @@ -51,7 +51,7 @@ jobs: GH_TOKEN: ${{ secrets.FILAMENTBOT_TOKEN }} run: | bash docs_src/build/install_mdbook.sh && source ~/.bashrc - COMMIT_HASH=$(echo "${{ steps.get_commit_msg.outputs.msg }}" | head -n 1 | sed "s/commit //g") + COMMIT_HASH="${{ steps.get_commit_msg.outputs.hash }}" git config --global user.email "filament.bot@gmail.com" git config --global user.name "Filament Bot" git config --global credential.helper cache diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 1d9b8df741..79a29fcbaf 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -108,8 +108,7 @@ jobs: uses: ./.github/actions/get-commit-msg - name: Check for manual edits to /docs run: | - COMMIT_ID=$(echo "${{ steps.get_commit_msg.outputs.msg }}" | head -n 1 | sed "s/commit //g") - bash docs_src/build/presubmit_check.sh ${COMMIT_ID} + bash docs_src/build/presubmit_check.sh ${{ steps.get_commit_msg.outputs.hash }} test-renderdiff: name: test-renderdiff @@ -121,7 +120,7 @@ jobs: - uses: ./.github/actions/mac-prereq - uses: ./.github/actions/get-gltf-assets - uses: ./.github/actions/get-mesa - - uses: ./.github/actions/get-vulkan-sdk + - uses: ./.github/actions/get-vulkan-sdk - id: get_commit_msg uses: ./.github/actions/get-commit-msg - name: Prerequisites @@ -132,12 +131,14 @@ jobs: shell: bash - name: Render and compare id: render_compare + env: + COMMIT_MESSAGE: ${{ steps.get_commit_msg.outputs.msg }} run: | ls ./gltf/Models TEST_DIR=test/renderdiff source ${TEST_DIR}/src/preamble.sh start_ - GOLDEN_BRANCH=$(echo "${{ steps.get_commit_msg.outputs.msg }}" | python3 ${TEST_DIR}/src/commit_msg.py) + GOLDEN_BRANCH=$(echo "${COMMIT_MESSAGE}" | python3 ${TEST_DIR}/src/commit_msg.py) bash ${TEST_DIR}/generate.sh && \ python3 ${TEST_DIR}/src/golden_manager.py \ --branch=${GOLDEN_BRANCH} \ diff --git a/README.md b/README.md index c64b189f74..9271819274 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ repositories { } dependencies { - implementation 'com.google.android.filament:filament-android:1.66.1' + implementation 'com.google.android.filament:filament-android:1.66.2' } ``` @@ -51,7 +51,7 @@ Here are all the libraries available in the group `com.google.android.filament`: iOS projects can use CocoaPods to install the latest release: ```shell -pod 'Filament', '~> 1.66.1' +pod 'Filament', '~> 1.66.2' ``` ## Documentation diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index d5d43bb775..5b4ff993b7 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -7,6 +7,9 @@ A new header is inserted each time a *tag* is created. Instead, if you are authoring a PR for the main branch, add your release note to [NEW_RELEASE_NOTES.md](./NEW_RELEASE_NOTES.md). +## v1.66.2 + + ## v1.66.1 - filamat: Removed a dependency on Glslang's deprecated SPIR-V remapper. diff --git a/android/gradle.properties b/android/gradle.properties index 28b3600d9e..1f276c49a9 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.google.android.filament -VERSION_NAME=1.66.1 +VERSION_NAME=1.66.2 POM_DESCRIPTION=Real-time physically based rendering engine for Android. diff --git a/docs/dup/intro.html b/docs/dup/intro.html index 51847f6a61..6488020b70 100644 --- a/docs/dup/intro.html +++ b/docs/dup/intro.html @@ -181,7 +181,7 @@ important for matc (material compiler).

} dependencies { - implementation 'com.google.android.filament:filament-android:1.65.4' + implementation 'com.google.android.filament:filament-android:1.66.0' }

Here are all the libraries available in the group com.google.android.filament:

@@ -196,7 +196,7 @@ dependencies {

iOS

iOS projects can use CocoaPods to install the latest release:

-
pod 'Filament', '~> 1.65.4'
+
pod 'Filament', '~> 1.66.0'
 

Documentation