diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 42a2e7e..4e36ed5 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -15,7 +15,7 @@ env: UNITY_PROJECT_PATH: '' concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} jobs: validate: @@ -33,25 +33,31 @@ jobs: steps: - name: checkout self - uses: actions/checkout@v3 + uses: actions/checkout@v4 + + - run: npm install - name: checkout test project - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: xrtk/com.xrtk.test path: test-project - - uses: xrtk/unity-setup@v7.1 + - uses: xrtk/unity-setup@v7.4 with: build-targets: ${{ matrix.build-target }} version-file-path: 'test-project/**/ProjectSettings/ProjectVersion.txt' - - uses: xrtk/activate-unity-license@v2 + # Activates the installation with the provided credentials + - uses: xrtk/activate-unity-license@v5.1 with: + # Required username: ${{ secrets.UNITY_USERNAME }} password: ${{ secrets.UNITY_PASSWORD }} - serial: ${{ secrets.UNITY_SERIAL }} # Required for pro/plus activations - license-type: 'Professional' # Chooses license type to use [ Personal, Professional ] + # Optional + license-type: 'Personal' # Chooses license type to use [ Personal, Professional ] + # serial: ${{ secrets.UNITY_SERIAL }} # Required for pro/plus activations + auth-key: ${{ secrets.UNITY_2FA_KEY }} # required for personal activations - name: xrtk/unity-action uses: ./ @@ -59,10 +65,11 @@ jobs: log-name: 'Test' args: '-quit -batchmode -nographics' - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 name: Upload Artifacts if: always() with: - name: '${{ runner.os }}-${{ matrix.build-target }}-Artifacts' - path: '${{ env.UNITY_PROJECT_PATH }}/Builds' - if-no-files-found: ignore + name: '${{ github.run_number }}.${{ github.run_attempt }}-${{ runner.os }}-${{ matrix.build-target }}-Artifacts' + path: | + ${{ env.UNITY_PROJECT_PATH }}/**/*.log + ${{ env.UNITY_PROJECT_PATH }}/Builds/${{ matrix.build-target }}/ diff --git a/README.md b/README.md index 77a40f4..15e12f9 100644 --- a/README.md +++ b/README.md @@ -51,12 +51,12 @@ jobs: # sets -> env.UNITY_EDITOR_PATH # sets -> env.UNITY_PROJECT_PATH # https://github.com/XRTK/unity-setup - - uses: xrtk/unity-setup@v7.1 + - uses: xrtk/unity-setup@v7.4 with: build-targets: ${{ matrix.build-target }} # Activates the installation with the provided credentials - - uses: xrtk/activate-unity-license@v2 + - uses: xrtk/activate-unity-license@v5.1 with: # Required username: ${{ secrets.UNITY_USERNAME }} @@ -65,14 +65,14 @@ jobs: license-type: 'Personal' # Chooses license type to use [ Personal, Professional ] serial: ${{ secrets.UNITY_SERIAL }} # Required for pro/plus activations - - uses: xrtk/unity-action@v6 + - uses: xrtk/unity-action@v6.1 name: '${{ matrix.build-target }}-Tests' with: build-target: '${{ matrix.build-target }}' args: '-batchmode -runEditorTests' log-name: '${{ matrix.build-target }}-Tests' - - uses: xrtk/unity-action@v6 + - uses: xrtk/unity-action@v6.1 name: '${{ matrix.build-target }}-Build' with: build-target: '${{ matrix.build-target }}' diff --git a/action.yml b/action.yml index d55ddab..ebd71b5 100644 --- a/action.yml +++ b/action.yml @@ -17,6 +17,6 @@ inputs: required: false default: 'Unity' runs: - using: 'node16' + using: 'node20' main: 'dist/index.js' post: 'dist/index.js' diff --git a/package-lock.json b/package-lock.json index 8967000..4f1f7d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "unity-action", - "version": "6.0.0", - "lockfileVersion": 2, + "version": "6.1.0", + "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "unity-action", - "version": "6.0.0", + "version": "6.1.0", "license": "MIT", "dependencies": { "@actions/core": "^1.10.0", @@ -18,9 +18,9 @@ } }, "node_modules/@actions/core": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz", - "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz", + "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==", "dependencies": { "@actions/http-client": "^2.0.1", "uuid": "^8.3.2" @@ -35,17 +35,26 @@ } }, "node_modules/@actions/http-client": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz", - "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.0.tgz", + "integrity": "sha512-q+epW0trjVUUHboliPb4UF9g2msf+w61b32tAkFEwL/IwP0DQWgbCMM0Hbe3e3WXSKz5VcUXbzJQgy8Hkra/Lg==", "dependencies": { - "tunnel": "^0.0.6" + "tunnel": "^0.0.6", + "undici": "^5.25.4" } }, "node_modules/@actions/io": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.2.tgz", - "integrity": "sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw==" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz", + "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==" + }, + "node_modules/@fastify/busboy": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.0.tgz", + "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==", + "engines": { + "node": ">=14" + } }, "node_modules/@vercel/ncc": { "version": "0.34.0", @@ -64,6 +73,17 @@ "node": ">=0.6.11 <=0.7.0 || >=0.7.3" } }, + "node_modules/undici": { + "version": "5.28.2", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz", + "integrity": "sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==", + "dependencies": { + "@fastify/busboy": "^2.0.0" + }, + "engines": { + "node": ">=14.0" + } + }, "node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -72,53 +92,5 @@ "uuid": "dist/bin/uuid" } } - }, - "dependencies": { - "@actions/core": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz", - "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==", - "requires": { - "@actions/http-client": "^2.0.1", - "uuid": "^8.3.2" - } - }, - "@actions/exec": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz", - "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==", - "requires": { - "@actions/io": "^1.0.1" - } - }, - "@actions/http-client": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz", - "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==", - "requires": { - "tunnel": "^0.0.6" - } - }, - "@actions/io": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.2.tgz", - "integrity": "sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw==" - }, - "@vercel/ncc": { - "version": "0.34.0", - "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.34.0.tgz", - "integrity": "sha512-G9h5ZLBJ/V57Ou9vz5hI8pda/YQX5HQszCs3AmIus3XzsmRn/0Ptic5otD3xVST8QLKk7AMk7AqpsyQGN7MZ9A==", - "dev": true - }, - "tunnel": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", - "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==" - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - } } } diff --git a/package.json b/package.json index ebd6449..219af03 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "unity-action", - "version": "6.0.0", + "version": "6.1.0", "description": "An atomic GitHub Action that runs the Unity engine via cli with the provided parameters.", "main": "src/index.js", "scripts": {