Skip to content

Commit bba1a4d

Browse files
committed
Merge branch 'feature/icosa-integration' into temp/openxr-icosa-working
# Conflicts: # Assets/Prefabs/CameraRig.prefab # Assets/Prefabs/Config.prefab # Assets/Scripts/api_clients/assets_service_client/AssetsServiceClient.cs # Assets/Scripts/desktop_app/DebugConsole.cs # Assets/Scripts/model/controller/PaletteController.cs # Assets/UltimateXR Keyboard.meta # Assets/UltimateXR Keyboard/KeyboardKeyUI.cs # Assets/UltimateXR Keyboard/KeyboardKeyUI.cs.meta # Assets/UltimateXR Keyboard/KeyboardToggleSymbolsPage.cs # Assets/UltimateXR Keyboard/KeyboardToggleSymbolsPage.cs.meta # Assets/UltimateXR Keyboard/KeyboardUI.cs # Assets/UltimateXR Keyboard/KeyboardUI.cs.meta # Assets/UltimateXR Keyboard/LICENCE # Assets/UltimateXR Keyboard/LICENCE.meta
2 parents 385d9e1 + 7f0da0f commit bba1a4d

34 files changed

+22619
-490
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ updates:
99
- "mikeage"
1010
assignees:
1111
- "mikeage"
12+
groups:
13+
all-actions-updates:
14+
patterns:
15+
- "**"

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,14 +496,13 @@ jobs:
496496
497497
- name: Publish
498498
uses: softprops/action-gh-release@v2
499-
env:
500-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
501499
with:
502500
body: ${{ steps.changelog.outputs.changelog }}
503501
prerelease: ${{ needs.configuration.outputs.prerelease }}
504502
target_commitish: ${{ needs.configuration.outputs.currentrelease }}
505503
tag_name: ${{ needs.configuration.outputs.version }}
506504
files: releases/*
505+
token: ${{ secrets.RELEASE_TOKEN }}
507506

508507
publish_gitbook:
509508
name: Publish changelog from last major build to open-blocks-docs

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v4
16-
- uses: actions/setup-python@v5.2.0
16+
- uses: actions/setup-python@v5.3.0
1717
with:
1818
python-version: '3.12'
19-
- uses: actions/setup-dotnet@v4.0.1
19+
- uses: actions/setup-dotnet@v4.1.0
2020
with:
2121
dotnet-version: '8.0.x'
2222
- name: Install pre-commit

0 commit comments

Comments
 (0)