From 0bb0d3efeaf37ee008dad60710671e2739cb190d Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Wed, 9 Jul 2025 08:50:41 -0700 Subject: Add mac runner Uncommenting mac runner lines to enable newly set up self-hosted runner with the workflow. --- .github/workflows/qatest.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index 5d8894a3f4..11ac1edaf2 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -46,11 +46,10 @@ jobs: runner: qa-dan-asus artifact: Windows-installer install-path: 'C:\viewer-automation-main' - # Commented out until mac runner is available - # - os: mac - # runner: qa-mac-atlas - # artifact: Mac-installer - # install-path: '$HOME/Documents/viewer-automation' + - os: mac + runner: qa-mac-atlas + artifact: Mac-installer + install-path: '$HOME/Documents/viewer-automation' fail-fast: false runs-on: [self-hosted, "${{ matrix.runner }}"] -- cgit v1.2.3 From 8c6e766311b13ab3f8494f0db6400e82392f6660 Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Wed, 9 Jul 2025 13:12:16 -0700 Subject: Adjust mac artifact name It was previously looking for a Mac-installer artifact instead of macOS-installer --- .github/workflows/qatest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index 11ac1edaf2..7bdb8cb9aa 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -48,7 +48,7 @@ jobs: install-path: 'C:\viewer-automation-main' - os: mac runner: qa-mac-atlas - artifact: Mac-installer + artifact: macOS-installer install-path: '$HOME/Documents/viewer-automation' fail-fast: false -- cgit v1.2.3 From 7b4cdd3040e1ebcd37c298fd97ef03ea41c65c1b Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Wed, 9 Jul 2025 14:14:40 -0700 Subject: Adjust permission before copying app --- .github/workflows/qatest.yaml | 3 +++ 1 file changed, 3 insertions(+) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index 7bdb8cb9aa..9b5e0173f9 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -514,6 +514,9 @@ jobs: # Copy the app to the Applications folder (or specified install path) cp -R "$APP_PATH" "${{ matrix.install-path }}" + # Fix permissions before copying + chmod -R u+rw "$APP_PATH" + # Verify the app was copied successfully if [ ! -d "${{ matrix.install-path }}/$(basename "$APP_PATH")" ]; then echo "❌ Error: Failed to install application to ${{ matrix.install-path }}!" -- cgit v1.2.3 From 9533232ce740bdeaf179a806cddd4825f44b2c45 Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Wed, 9 Jul 2025 14:26:09 -0700 Subject: Mount dmg to new /Volumes Currently hitting another permission error while attempting to mount dmg in tmp --- .github/workflows/qatest.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index 9b5e0173f9..707288abb8 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -493,11 +493,11 @@ jobs: run: | # Mac installation echo "Mounting DMG installer..." - MOUNT_POINT="/tmp/secondlife-dmg" + MOUNT_POINT="/Volumes/SecondLifeMount" mkdir -p "$MOUNT_POINT" # Mount the DMG - hdiutil attach "${{ env.INSTALLER_PATH }}" -mountpoint "$MOUNT_POINT" -nobrowse + hdiutil attach "$INSTALLER_PATH" -mountpoint "$MOUNT_POINT" -nobrowse echo "✅ DMG mounted at $MOUNT_POINT" @@ -511,14 +511,14 @@ jobs: echo "Installing application to Applications folder..." - # Copy the app to the Applications folder (or specified install path) - cp -R "$APP_PATH" "${{ matrix.install-path }}" - # Fix permissions before copying chmod -R u+rw "$APP_PATH" + # Copy the app to the Applications folder (or specified install path) + cp -R "$APP_PATH" "${{ matrix.install-path }}" + # Verify the app was copied successfully - if [ ! -d "${{ matrix.install-path }}/$(basename "$APP_PATH")" ]; then + if [ ! -d "${{ matrix.install-path }}/$(basename \"$APP_PATH\")" ]; then echo "❌ Error: Failed to install application to ${{ matrix.install-path }}!" exit 1 fi @@ -527,7 +527,7 @@ jobs: # Save mount point for cleanup echo "MOUNT_POINT=$MOUNT_POINT" >> $GITHUB_ENV - + - name: Wait for Installation to Complete (Mac) if: matrix.os == 'mac' shell: bash -- cgit v1.2.3 From c8f6eb045dba0b104afbf8bc4b01b4abd1db6b42 Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Wed, 9 Jul 2025 14:27:46 -0700 Subject: Remove whitespace --- .github/workflows/qatest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index 707288abb8..c5889a4eb3 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -527,7 +527,7 @@ jobs: # Save mount point for cleanup echo "MOUNT_POINT=$MOUNT_POINT" >> $GITHUB_ENV - + - name: Wait for Installation to Complete (Mac) if: matrix.os == 'mac' shell: bash -- cgit v1.2.3 From 8fe51b3c9a210b57a210e1178ae594bd5e848bc0 Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Wed, 9 Jul 2025 14:38:36 -0700 Subject: Adjusting dmg mount point Permission issues yet again. Adjusting this back --- .github/workflows/qatest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index c5889a4eb3..87e8bed1fc 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -493,7 +493,7 @@ jobs: run: | # Mac installation echo "Mounting DMG installer..." - MOUNT_POINT="/Volumes/SecondLifeMount" + MOUNT_POINT="/tmp/secondlife-dmg" mkdir -p "$MOUNT_POINT" # Mount the DMG -- cgit v1.2.3 From 239a9c7242307f2f738c91165038f5ac6b0c8d8a Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Thu, 10 Jul 2025 08:18:16 -0700 Subject: Removing previous permission "fix" --- .github/workflows/qatest.yaml | 3 --- 1 file changed, 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index 87e8bed1fc..b3dd267276 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -511,9 +511,6 @@ jobs: echo "Installing application to Applications folder..." - # Fix permissions before copying - chmod -R u+rw "$APP_PATH" - # Copy the app to the Applications folder (or specified install path) cp -R "$APP_PATH" "${{ matrix.install-path }}" -- cgit v1.2.3 From 450d4d77f75801eba3576207e3e9df5f3e9cfdc1 Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Thu, 10 Jul 2025 08:39:09 -0700 Subject: New copy app command An attempt to resolve another permission issue --- .github/workflows/qatest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index b3dd267276..62b83f814f 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -512,7 +512,7 @@ jobs: echo "Installing application to Applications folder..." # Copy the app to the Applications folder (or specified install path) - cp -R "$APP_PATH" "${{ matrix.install-path }}" + rsync -a --no-xattrs --inplace "$APP_PATH" "${{ matrix.install-path }}/" # Verify the app was copied successfully if [ ! -d "${{ matrix.install-path }}/$(basename \"$APP_PATH\")" ]; then -- cgit v1.2.3 From 2f77cd09a98c2fbc1e928bf04d400afdeaf55a13 Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Thu, 10 Jul 2025 08:42:34 -0700 Subject: Remove --no-xattrs option --- .github/workflows/qatest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index 62b83f814f..db6268e200 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -512,7 +512,7 @@ jobs: echo "Installing application to Applications folder..." # Copy the app to the Applications folder (or specified install path) - rsync -a --no-xattrs --inplace "$APP_PATH" "${{ matrix.install-path }}/" + rsync -a --inplace "$APP_PATH" "${{ matrix.install-path }}/" # Verify the app was copied successfully if [ ! -d "${{ matrix.install-path }}/$(basename \"$APP_PATH\")" ]; then -- cgit v1.2.3 From c70875e0ba93151a19c7b48e3d66dfe9ed556171 Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Thu, 10 Jul 2025 08:56:37 -0700 Subject: Redirecting viewer installation to Application directory --- .github/workflows/qatest.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index db6268e200..ba2c0ed6d9 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -501,7 +501,9 @@ jobs: echo "✅ DMG mounted at $MOUNT_POINT" - # Find the app in the mounted DMG + echo "Installing application to default location from DMG..." + + # Find the .app bundle in the DMG APP_PATH=$(find "$MOUNT_POINT" -name "*.app" -type d | head -1) if [ -z "$APP_PATH" ]; then @@ -509,18 +511,17 @@ jobs: exit 1 fi - echo "Installing application to Applications folder..." - - # Copy the app to the Applications folder (or specified install path) - rsync -a --inplace "$APP_PATH" "${{ matrix.install-path }}/" + # Use the default macOS installer to copy the .app to /Applications + cp -R "$APP_PATH" /Applications/ # Verify the app was copied successfully - if [ ! -d "${{ matrix.install-path }}/$(basename \"$APP_PATH\")" ]; then - echo "❌ Error: Failed to install application to ${{ matrix.install-path }}!" + APP_NAME=$(basename "$APP_PATH") + if [ ! -d "/Applications/$APP_NAME" ]; then + echo "❌ Error: Failed to install application to /Applications!" exit 1 fi - echo "✅ Application installed successfully to ${{ matrix.install-path }}" + echo "✅ Application installed successfully to /Applications" # Save mount point for cleanup echo "MOUNT_POINT=$MOUNT_POINT" >> $GITHUB_ENV -- cgit v1.2.3 From db5af314b9054be7c4c021643d43852bf06cef6d Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Thu, 10 Jul 2025 10:27:16 -0700 Subject: Remove previously installed viewer More permission issues encountered if a job is repeated. That is, when attempting to replace an existing installed viewer. --- .github/workflows/qatest.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index ba2c0ed6d9..29d55c775f 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -511,12 +511,20 @@ jobs: exit 1 fi - # Use the default macOS installer to copy the .app to /Applications + APP_NAME=$(basename "$APP_PATH") + DEST_PATH="/Applications/$APP_NAME" + + # Remove existing installation if it exists to avoid permission conflicts + if [ -d "$DEST_PATH" ]; then + echo "Removing existing installation..." + sudo rm -rf "$DEST_PATH" + fi + + # Copy the .app to /Applications cp -R "$APP_PATH" /Applications/ # Verify the app was copied successfully - APP_NAME=$(basename "$APP_PATH") - if [ ! -d "/Applications/$APP_NAME" ]; then + if [ ! -d "$DEST_PATH" ]; then echo "❌ Error: Failed to install application to /Applications!" exit 1 fi -- cgit v1.2.3 From 9cc5c072990e90777fc8df69c26a92975e788054 Mon Sep 17 00:00:00 2001 From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> Date: Thu, 10 Jul 2025 10:36:16 -0700 Subject: New method to handle removing previous viewer Moving previous viewer to trash instead of "removing" it. --- .github/workflows/qatest.yaml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index 29d55c775f..4e10900441 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -514,13 +514,28 @@ jobs: APP_NAME=$(basename "$APP_PATH") DEST_PATH="/Applications/$APP_NAME" - # Remove existing installation if it exists to avoid permission conflicts + # Handle existing installation if [ -d "$DEST_PATH" ]; then - echo "Removing existing installation..." - sudo rm -rf "$DEST_PATH" + echo "Found existing installation at: $DEST_PATH" + echo "Moving existing installation to trash..." + + # Move to trash instead of force removing + TRASH_PATH="$HOME/.Trash/$(date +%Y%m%d_%H%M%S)_$APP_NAME" + mv "$DEST_PATH" "$TRASH_PATH" || { + echo "⚠️ Could not move to trash, trying direct removal..." + rm -rf "$DEST_PATH" || { + echo "❌ Could not remove existing installation" + echo "Please manually remove: $DEST_PATH" + exit 1 + } + } + + echo "✅ Existing installation handled successfully" fi # Copy the .app to /Applications + echo "Copying app from: $APP_PATH" + echo "To destination: /Applications/" cp -R "$APP_PATH" /Applications/ # Verify the app was copied successfully -- cgit v1.2.3 From 632bcd3d1e9dd827e868ef03c81223a394d27f38 Mon Sep 17 00:00:00 2001 From: Signal Linden Date: Sat, 26 Jul 2025 11:29:12 -0700 Subject: Add media request to pull_request_template.md (#4440) * Add media request to pull_request_template.md A picture can be worth a thousand words. Prompt users to provide media when creating a PRs. * Update pull_request_template.md --- .github/pull_request_template.md | 1 + 1 file changed, 1 insertion(+) (limited to '.github') diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 473498833e..5fe8870337 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -19,6 +19,7 @@ Issue Link: Please ensure the following before requesting review: - [ ] I have provided a clear title and detailed description for this pull request. +- [ ] If useful, I have included media such as screenshots and video to show off my changes. - [ ] The PR is linked to a relevant issue with sufficient context. - [ ] I have tested the changes locally and verified they work as intended. - [ ] All new and existing tests pass. -- cgit v1.2.3