Merge pull request #928 from steilerDev/beta

Author: steilerDev

.devcontainer.json

@@ -39,7 +39,8 @@
                 "GitHub.vscode-pull-request-github",
                 "ritwickdey.LiveServer",
                 "vscodevim.vim",
-                "wdhongtw.gpg-indicator"
+                "wdhongtw.gpg-indicator",
+                "docker.docker"
             ]
         }
     },

.github/acquire-trust-token.sh

@@ -34,6 +34,8 @@ echo -n "Starting $DOCKER_IMAGE..."
 DOCKER_NAME=$(docker run -d \
   -e APPLE_ID_USER="$TEST_APPLE_ID_USER" \
   -e APPLE_ID_PWD="$TEST_APPLE_ID_PWD" \
+  -e PORT="80" \
+  -p 9999:80 \
   -v $TMP_DIR:/opt/icloud-photos-library \
   $DOCKER_IMAGE \
   token
@@ -57,13 +59,13 @@ echo "server available"
 
 echo "Requesting code..."
 # Resend MFA code via SMS
-docker exec $DOCKER_NAME curl -s -X POST "http://localhost:80/api/resend_mfa?method=${MFA_METHOD}&phoneNumberId=${MFA_ID}" | jq -crM .message
+curl -s -X POST "http://localhost:9999/api/resend_mfa?method=${MFA_METHOD}&phoneNumberId=${MFA_ID}" | jq -crM .message
 
 echo "Please enter MFA code:"
 read MFA_CODE
 
 # Send MFA code
-docker exec $DOCKER_NAME curl -s -X POST "http://localhost:80/api/mfa?code=${MFA_CODE}" | jq -crM .message
+curl -s -X POST "http://localhost:9999/api/mfa?code=${MFA_CODE}" | jq -crM .message
 
 echo "Waiting for container to exit..."
 docker wait $DOCKER_NAME

.github/actions/build/app-setup/action.yml

@@ -9,7 +9,7 @@ runs:
   using: composite
   steps:
     - id: setup-node
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v6
       with:
         node-version-file: ${{ inputs.app-path }}/node-version
         cache: npm

.github/actions/build/app/action.yml

@@ -21,7 +21,7 @@ runs:
         fileName=$(cd ${{ inputs.app-path }}; npm pack)
         mv ${{ inputs.app-path }}/$fileName npm-pack.tgz
     - id: upload-artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: ${{ inputs.artifact-name }}
         path: npm-pack.tgz

.github/actions/build/docker-setup/action.yml

@@ -12,26 +12,15 @@ runs:
       uses: docker/setup-qemu-action@v3
     - id: setup-buildx
       uses: docker/setup-buildx-action@v3
-    - id: setup-fs
-      shell: bash
-      run: mkdir -p "${{ inputs.docker-path }}/rootfs/opt/"
     - id: setup-release-app-artifact
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       continue-on-error: true
       with:
         name: app-artifact-release
-        path: ${{ inputs.docker-path }}/rootfs/opt/
+        path: ${{ inputs.docker-path }}/
     - id: setup-build-app-artifact
       if: steps.setup-release-app-artifact.outcome == 'failure'
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: app-artifact-build
-        path: ${{ inputs.docker-path }}/rootfs/opt/
-    - id: validate-app-artifact
-      shell: bash
-      run: |
-        tree -a "${{ inputs.docker-path }}/"
-        tar -xOf ${{ inputs.docker-path }}/rootfs/opt/npm-pack.tgz package/package.json
-    - id: build-rootfs
-      shell: bash
-      run: tar -C ${{ inputs.docker-path }}/rootfs -czf ${{ inputs.docker-path }}/rootfs.tar.gz ./
+        path: ${{ inputs.docker-path }}/

.github/actions/build/docker/action.yml

@@ -54,7 +54,7 @@ runs:
         mv docker-*.tar.gz docker-artifact/
         echo "artifact-path=docker-artifact/" >> $GITHUB_OUTPUT
     - name: upload-artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: ${{ inputs.artifact-name }}
         path: ${{ steps.package-artifact.outputs.artifact-path }}

.github/actions/build/docs-setup/action.yml

@@ -26,7 +26,7 @@ runs:
       shell: bash
       run: pip install -r ${{ inputs.docs-path }}/requirements.txt
     - id: setup-node
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v6
       with:
         node-version-file: ${{ inputs.app-path }}/node-version
         cache: npm

.github/actions/helper/prepare-semantic-release/action.yml

@@ -78,7 +78,7 @@ runs:
         echo "Wrote:"
         cat ${{ inputs.release-dir }}/.releaserc.json
     - id: setup-node
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v6
       with:
         node-version-file: ${{ inputs.node-version-file }}
         cache: npm