From 54ed7880d33e4fbc9748e4055e2f5d6a45912260 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Fri, 31 Jan 2025 13:46:29 +0200 Subject: [PATCH 01/11] chore: release v3.0.1 --- CHANGELOG.md | 5 +++++ package-lock.json | 4 ++-- package.json | 2 +- src/version.ts | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7997c50e..76e017b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log - @splunk/otel + +## 3.0.1 + +- Make 3.x latest instead of 2.16 + ## 3.0.0 > [!WARNING] diff --git a/package-lock.json b/package-lock.json index 5250c2d4..b96a0d91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@splunk/otel", - "version": "3.0.0", + "version": "3.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@splunk/otel", - "version": "3.0.0", + "version": "3.0.1", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 734be34f..2eeb8a66 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@splunk/otel", - "version": "3.0.0", + "version": "3.0.1", "description": "The Splunk distribution of OpenTelemetry Node Instrumentation provides a Node agent that automatically instruments your Node application to capture and report distributed traces to Splunk APM.", "repository": "git@github.com:signalfx/splunk-otel-js.git", "author": "Splunk ", diff --git a/src/version.ts b/src/version.ts index 55e87672..583c22ee 100644 --- a/src/version.ts +++ b/src/version.ts @@ -14,4 +14,4 @@ * limitations under the License. */ -export const VERSION = '3.0.0'; +export const VERSION = '3.0.1'; From 6b2ea821e7ef76144d5295b4e7cbdf6eba578d17 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Fri, 31 Jan 2025 17:03:01 +0200 Subject: [PATCH 02/11] Upgrade actions/upload-artifact --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 753b4c81..a2b78f90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - name: Prebuild run: npm run prebuild:os ${{ matrix.node_api_target }} - name: upload prebuilds - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: prebuilds-linux path: prebuilds @@ -53,7 +53,7 @@ jobs: - name: Prebuild run: npm run prebuild:os ${{ matrix.node_api_target }} - name: upload prebuilds - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: prebuilds-linux-arm64 path: prebuilds @@ -82,7 +82,7 @@ jobs: - name: Prebuild run: npm run prebuild:os ${{ matrix.node_api_target }} - name: upload prebuilds - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: prebuilds-macos-windows path: prebuilds @@ -116,7 +116,7 @@ jobs: run: | echo "::set-output name=package_file::$(npm pack)" - name: Upload package - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ steps.pack.outputs.package_file }} path: ${{ steps.pack.outputs.package_file }} @@ -196,7 +196,7 @@ jobs: - name: Generate metadata YAML run: node scripts/generate-metadata-yaml.js > splunk-otel-js-metadata.yaml - name: Upload metadata yaml - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: splunk-otel-js-metadata.yaml path: splunk-otel-js-metadata.yaml From 9d38a6ccfe7a931df48f70b03138ab2430e94957 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Mon, 3 Feb 2025 17:59:46 +0200 Subject: [PATCH 03/11] Fix upload/download --- .github/workflows/ci.yml | 54 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2b78f90..ed75b9fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,8 +31,19 @@ jobs: - name: upload prebuilds uses: actions/upload-artifact@v4 with: - name: prebuilds-linux + name: prebuilds-linux-${{ matrix.node_api_target }} path: prebuilds + + merge-prebuilds-linux: + runs-on: ubuntu-latest + needs: prebuilds-linux + steps: + - name: Merge Linux Prebuilds + uses: actions/upload-artifact/merge@v4 + with: + name: prebuilds-linux + pattern: prebuilds-linux-* + prebuilds-linux-arm64: runs-on: [self-hosted, Linux, ARM64] strategy: @@ -55,9 +66,19 @@ jobs: - name: upload prebuilds uses: actions/upload-artifact@v4 with: - name: prebuilds-linux-arm64 + name: prebuilds-linux-arm64-${{ matrix.node_api_target }} path: prebuilds + merge-prebuilds-linux-arm64: + runs-on: ubuntu-latest + needs: prebuilds-linux-arm64 + steps: + - name: Merge Linux ARM64 Prebuilds + uses: actions/upload-artifact/merge@v4 + with: + name: prebuilds-linux-arm64 + pattern: prebuilds-linux-arm64-* + prebuilds-macos-windows: strategy: fail-fast: false @@ -84,11 +105,21 @@ jobs: - name: upload prebuilds uses: actions/upload-artifact@v4 with: - name: prebuilds-macos-windows + name: prebuilds-${{ runner.os }}-${{ matrix.node_api_target }} path: prebuilds + merge-prebuilds-macos-windows: + runs-on: ubuntu-latest + needs: prebuilds-macos-windows + steps: + - name: Merge macOS & Windows Prebuilds + uses: actions/upload-artifact/merge@v4 + with: + name: prebuilds-macos-windows + pattern: prebuilds-* + create-package: - needs: [prebuilds-linux, prebuilds-macos-windows, prebuilds-linux-arm64] + needs: [merge-prebuilds-linux, merge-prebuilds-linux-arm64, merge-prebuilds-macos-windows] runs-on: ubuntu-latest steps: - name: Checkout @@ -99,8 +130,21 @@ jobs: - uses: actions/setup-node@v3 with: node-version: '16' - - name: download prebuilds + - name: Download merged prebuilds (linux) + uses: actions/download-artifact@v3 + with: + name: prebuilds-linux + path: prebuilds + - name: Download merged prebuilds (ARM64) uses: actions/download-artifact@v3 + with: + name: prebuilds-linux-arm64 + path: prebuilds + - name: Download merged prebuilds (macOS/Windows) + uses: actions/download-artifact@v3 + with: + name: prebuilds-macos-windows + path: prebuilds - name: copy prebuilds run: | mkdir -p prebuilds From eec70d70b95cf960428ea1205a36633552ed2288 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Mon, 3 Feb 2025 19:09:11 +0200 Subject: [PATCH 04/11] Upgrade download also --- .github/workflows/ci.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed75b9fe..d1528fda 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,20 +130,11 @@ jobs: - uses: actions/setup-node@v3 with: node-version: '16' - - name: Download merged prebuilds (linux) - uses: actions/download-artifact@v3 + - name: Download all prebuilds + uses: actions/download-artifact@v4 with: - name: prebuilds-linux - path: prebuilds - - name: Download merged prebuilds (ARM64) - uses: actions/download-artifact@v3 - with: - name: prebuilds-linux-arm64 - path: prebuilds - - name: Download merged prebuilds (macOS/Windows) - uses: actions/download-artifact@v3 - with: - name: prebuilds-macos-windows + pattern: prebuilds-* + merge-multiple: true path: prebuilds - name: copy prebuilds run: | From 4bd7336612b0dcb25224b5d467bd19965c7f3f81 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Mon, 3 Feb 2025 20:12:00 +0200 Subject: [PATCH 05/11] Fix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1528fda..b8e31735 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -134,11 +134,11 @@ jobs: uses: actions/download-artifact@v4 with: pattern: prebuilds-* - merge-multiple: true path: prebuilds - name: copy prebuilds run: | mkdir -p prebuilds + ls cp -r prebuilds-linux/* prebuilds cp -r prebuilds-macos-windows/* prebuilds cp -r prebuilds-linux-arm64/* prebuilds From 83aa413179f1b1e8a1d75f9ba3273e64e0696454 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Mon, 3 Feb 2025 22:39:08 +0200 Subject: [PATCH 06/11] Simplify --- .github/workflows/ci.yml | 199 ++++++++++++++++----------------------- 1 file changed, 83 insertions(+), 116 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8e31735..3efa10dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,16 +34,6 @@ jobs: name: prebuilds-linux-${{ matrix.node_api_target }} path: prebuilds - merge-prebuilds-linux: - runs-on: ubuntu-latest - needs: prebuilds-linux - steps: - - name: Merge Linux Prebuilds - uses: actions/upload-artifact/merge@v4 - with: - name: prebuilds-linux - pattern: prebuilds-linux-* - prebuilds-linux-arm64: runs-on: [self-hosted, Linux, ARM64] strategy: @@ -69,16 +59,6 @@ jobs: name: prebuilds-linux-arm64-${{ matrix.node_api_target }} path: prebuilds - merge-prebuilds-linux-arm64: - runs-on: ubuntu-latest - needs: prebuilds-linux-arm64 - steps: - - name: Merge Linux ARM64 Prebuilds - uses: actions/upload-artifact/merge@v4 - with: - name: prebuilds-linux-arm64 - pattern: prebuilds-linux-arm64-* - prebuilds-macos-windows: strategy: fail-fast: false @@ -108,18 +88,8 @@ jobs: name: prebuilds-${{ runner.os }}-${{ matrix.node_api_target }} path: prebuilds - merge-prebuilds-macos-windows: - runs-on: ubuntu-latest - needs: prebuilds-macos-windows - steps: - - name: Merge macOS & Windows Prebuilds - uses: actions/upload-artifact/merge@v4 - with: - name: prebuilds-macos-windows - pattern: prebuilds-* - create-package: - needs: [merge-prebuilds-linux, merge-prebuilds-linux-arm64, merge-prebuilds-macos-windows] + needs: [prebuilds-linux, prebuilds-linux-arm64, prebuilds-macos-windows] runs-on: ubuntu-latest steps: - name: Checkout @@ -137,11 +107,8 @@ jobs: path: prebuilds - name: copy prebuilds run: | - mkdir -p prebuilds ls - cp -r prebuilds-linux/* prebuilds - cp -r prebuilds-macos-windows/* prebuilds - cp -r prebuilds-linux-arm64/* prebuilds + ls prebuilds - name: Install npm dependencies run: npm ci --ignore-scripts - name: Build @@ -156,63 +123,63 @@ jobs: name: ${{ steps.pack.outputs.package_file }} path: ${{ steps.pack.outputs.package_file }} - unit-tests: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: ['ubuntu-latest', 'macos-latest'] - nodejs: ['18', '20', '21', '22', '23'] - include: - - os: 'macos-latest' - python_version: '3.11' - - os: 'windows-2019' - nodejs: '18.20.1' - - os: 'windows-2019' - nodejs: '20.12.1' - - os: 'windows-2019' - nodejs: '21.7.2' - - os: 'windows-2019' - nodejs: '22.10.0' - - os: 'windows-2019' - nodejs: '23.0.0' - steps: - - name: Checkout - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python_version }} - - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.nodejs }} - - name: Install npm dependencies - run: npm ci - - name: Test - run: npm run test - - name: Report Coverage - if: ${{matrix.nodejs == '16' && matrix.os == 'ubuntu-latest'}} - uses: codecov/codecov-action@v3 - with: - verbose: true + # unit-tests: + # runs-on: ${{ matrix.os }} + # strategy: + # fail-fast: false + # matrix: + # os: ['ubuntu-latest', 'macos-latest'] + # nodejs: ['18', '20', '21', '22', '23'] + # include: + # - os: 'macos-latest' + # python_version: '3.11' + # - os: 'windows-2019' + # nodejs: '18.20.1' + # - os: 'windows-2019' + # nodejs: '20.12.1' + # - os: 'windows-2019' + # nodejs: '21.7.2' + # - os: 'windows-2019' + # nodejs: '22.10.0' + # - os: 'windows-2019' + # nodejs: '23.0.0' + # steps: + # - name: Checkout + # uses: actions/checkout@v3 + # - uses: actions/setup-python@v4 + # with: + # python-version: ${{ matrix.python_version }} + # - uses: actions/setup-node@v3 + # with: + # node-version: ${{ matrix.nodejs }} + # - name: Install npm dependencies + # run: npm ci + # - name: Test + # run: npm run test + # - name: Report Coverage + # if: ${{matrix.nodejs == '16' && matrix.os == 'ubuntu-latest'}} + # uses: codecov/codecov-action@v3 + # with: + # verbose: true - unit-tests-arm64: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: ['ARM64'] - nodejs: ['18', '20', '21', '22', '23'] - container: node:${{ matrix.nodejs }} - steps: - - name: Checkout - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python_version }} - - name: Install npm dependencies - run: npm ci --unsafe-perm - - name: Test - run: npm run test + # unit-tests-arm64: + # runs-on: ${{ matrix.os }} + # strategy: + # fail-fast: false + # matrix: + # os: ['ARM64'] + # nodejs: ['18', '20', '21', '22', '23'] + # container: node:${{ matrix.nodejs }} + # steps: + # - name: Checkout + # uses: actions/checkout@v3 + # - uses: actions/setup-python@v4 + # with: + # python-version: ${{ matrix.python_version }} + # - name: Install npm dependencies + # run: npm ci --unsafe-perm + # - name: Test + # run: npm run test build: runs-on: ubuntu-latest @@ -236,28 +203,28 @@ jobs: name: splunk-otel-js-metadata.yaml path: splunk-otel-js-metadata.yaml - e2e-local: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - include: - - target: '' - name: 'Basic' - - target: '-f express.override.yml' - name: 'Express' - - target: '-f mixed.override.yml' - name: 'Mixed' - - target: '-f log-injection.override.yml' - name: 'Log injection' - - target: '-f profiling.override.yml' - name: 'Profiling' - - target: '-f typescript.override.yml' - name: 'TypeScript' - name: e2e local ${{ matrix.name }} - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Test ${{ matrix.name }} example - working-directory: test/examples - run: docker compose -f e2e.docker-compose.yml ${{ matrix.target }} up --exit-code-from test + # e2e-local: + # runs-on: ubuntu-latest + # strategy: + # fail-fast: false + # matrix: + # include: + # - target: '' + # name: 'Basic' + # - target: '-f express.override.yml' + # name: 'Express' + # - target: '-f mixed.override.yml' + # name: 'Mixed' + # - target: '-f log-injection.override.yml' + # name: 'Log injection' + # - target: '-f profiling.override.yml' + # name: 'Profiling' + # - target: '-f typescript.override.yml' + # name: 'TypeScript' + # name: e2e local ${{ matrix.name }} + # steps: + # - name: Checkout + # uses: actions/checkout@v3 + # - name: Test ${{ matrix.name }} example + # working-directory: test/examples + # run: docker compose -f e2e.docker-compose.yml ${{ matrix.target }} up --exit-code-from test From 739d4a3e48c38b5552467784556d431debf45563 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Mon, 3 Feb 2025 23:39:17 +0200 Subject: [PATCH 07/11] final --- .github/workflows/ci.yml | 168 ++++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 82 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3efa10dd..82ff52c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,11 @@ jobs: path: prebuilds - name: copy prebuilds run: | - ls + mkdir -p prebuilds + cp -r prebuilds-linux-arm64-*/* prebuilds + cp -r prebuilds-linux-*/* prebuilds + cp -r prebuilds-Windows-*/* prebuilds + cp -r prebuilds-macOS-*/* prebuilds ls prebuilds - name: Install npm dependencies run: npm ci --ignore-scripts @@ -123,63 +127,63 @@ jobs: name: ${{ steps.pack.outputs.package_file }} path: ${{ steps.pack.outputs.package_file }} - # unit-tests: - # runs-on: ${{ matrix.os }} - # strategy: - # fail-fast: false - # matrix: - # os: ['ubuntu-latest', 'macos-latest'] - # nodejs: ['18', '20', '21', '22', '23'] - # include: - # - os: 'macos-latest' - # python_version: '3.11' - # - os: 'windows-2019' - # nodejs: '18.20.1' - # - os: 'windows-2019' - # nodejs: '20.12.1' - # - os: 'windows-2019' - # nodejs: '21.7.2' - # - os: 'windows-2019' - # nodejs: '22.10.0' - # - os: 'windows-2019' - # nodejs: '23.0.0' - # steps: - # - name: Checkout - # uses: actions/checkout@v3 - # - uses: actions/setup-python@v4 - # with: - # python-version: ${{ matrix.python_version }} - # - uses: actions/setup-node@v3 - # with: - # node-version: ${{ matrix.nodejs }} - # - name: Install npm dependencies - # run: npm ci - # - name: Test - # run: npm run test - # - name: Report Coverage - # if: ${{matrix.nodejs == '16' && matrix.os == 'ubuntu-latest'}} - # uses: codecov/codecov-action@v3 - # with: - # verbose: true + unit-tests: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ['ubuntu-latest', 'macos-latest'] + nodejs: ['18', '20', '21', '22', '23'] + include: + - os: 'macos-latest' + python_version: '3.11' + - os: 'windows-2019' + nodejs: '18.20.1' + - os: 'windows-2019' + nodejs: '20.12.1' + - os: 'windows-2019' + nodejs: '21.7.2' + - os: 'windows-2019' + nodejs: '22.10.0' + - os: 'windows-2019' + nodejs: '23.0.0' + steps: + - name: Checkout + uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python_version }} + - uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.nodejs }} + - name: Install npm dependencies + run: npm ci + - name: Test + run: npm run test + - name: Report Coverage + if: ${{matrix.nodejs == '16' && matrix.os == 'ubuntu-latest'}} + uses: codecov/codecov-action@v3 + with: + verbose: true - # unit-tests-arm64: - # runs-on: ${{ matrix.os }} - # strategy: - # fail-fast: false - # matrix: - # os: ['ARM64'] - # nodejs: ['18', '20', '21', '22', '23'] - # container: node:${{ matrix.nodejs }} - # steps: - # - name: Checkout - # uses: actions/checkout@v3 - # - uses: actions/setup-python@v4 - # with: - # python-version: ${{ matrix.python_version }} - # - name: Install npm dependencies - # run: npm ci --unsafe-perm - # - name: Test - # run: npm run test + unit-tests-arm64: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ['ARM64'] + nodejs: ['18', '20', '21', '22', '23'] + container: node:${{ matrix.nodejs }} + steps: + - name: Checkout + uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python_version }} + - name: Install npm dependencies + run: npm ci --unsafe-perm + - name: Test + run: npm run test build: runs-on: ubuntu-latest @@ -203,28 +207,28 @@ jobs: name: splunk-otel-js-metadata.yaml path: splunk-otel-js-metadata.yaml - # e2e-local: - # runs-on: ubuntu-latest - # strategy: - # fail-fast: false - # matrix: - # include: - # - target: '' - # name: 'Basic' - # - target: '-f express.override.yml' - # name: 'Express' - # - target: '-f mixed.override.yml' - # name: 'Mixed' - # - target: '-f log-injection.override.yml' - # name: 'Log injection' - # - target: '-f profiling.override.yml' - # name: 'Profiling' - # - target: '-f typescript.override.yml' - # name: 'TypeScript' - # name: e2e local ${{ matrix.name }} - # steps: - # - name: Checkout - # uses: actions/checkout@v3 - # - name: Test ${{ matrix.name }} example - # working-directory: test/examples - # run: docker compose -f e2e.docker-compose.yml ${{ matrix.target }} up --exit-code-from test + e2e-local: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - target: '' + name: 'Basic' + - target: '-f express.override.yml' + name: 'Express' + - target: '-f mixed.override.yml' + name: 'Mixed' + - target: '-f log-injection.override.yml' + name: 'Log injection' + - target: '-f profiling.override.yml' + name: 'Profiling' + - target: '-f typescript.override.yml' + name: 'TypeScript' + name: e2e local ${{ matrix.name }} + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Test ${{ matrix.name }} example + working-directory: test/examples + run: docker compose -f e2e.docker-compose.yml ${{ matrix.target }} up --exit-code-from test From e07d804fe260a278b1958d92dad1bf498ba80970 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Mon, 3 Feb 2025 23:57:21 +0200 Subject: [PATCH 08/11] fix path --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82ff52c6..e4ced0af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,14 +104,14 @@ jobs: uses: actions/download-artifact@v4 with: pattern: prebuilds-* - path: prebuilds + path: allprebuilds - name: copy prebuilds run: | - mkdir -p prebuilds - cp -r prebuilds-linux-arm64-*/* prebuilds - cp -r prebuilds-linux-*/* prebuilds - cp -r prebuilds-Windows-*/* prebuilds - cp -r prebuilds-macOS-*/* prebuilds + mkdir -p prebuilds + cp -r allprebuilds/prebuilds-linux-arm64-*/* prebuilds + cp -r allprebuilds/prebuilds-linux-*/* prebuilds + cp -r allprebuilds/prebuilds-Windows-*/* prebuilds + cp -r allprebuildsprebuilds-macOS-*/* prebuilds ls prebuilds - name: Install npm dependencies run: npm ci --ignore-scripts From 6407a4355310873498ba51d13e94018d5a519ae0 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Mon, 3 Feb 2025 23:58:00 +0200 Subject: [PATCH 09/11] log --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4ced0af..83231bdf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,6 +107,9 @@ jobs: path: allprebuilds - name: copy prebuilds run: | + ls + echo "---" + ls allprebuilds mkdir -p prebuilds cp -r allprebuilds/prebuilds-linux-arm64-*/* prebuilds cp -r allprebuilds/prebuilds-linux-*/* prebuilds From ac4319504cbf26c804b859d91eaa4cd6adec7213 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Tue, 4 Feb 2025 09:54:22 +0200 Subject: [PATCH 10/11] Fix mac --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83231bdf..d7032bc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,7 +114,7 @@ jobs: cp -r allprebuilds/prebuilds-linux-arm64-*/* prebuilds cp -r allprebuilds/prebuilds-linux-*/* prebuilds cp -r allprebuilds/prebuilds-Windows-*/* prebuilds - cp -r allprebuildsprebuilds-macOS-*/* prebuilds + cp -r allprebuilds/prebuilds-macOS-*/* prebuilds ls prebuilds - name: Install npm dependencies run: npm ci --ignore-scripts From 85f0a034249828e2bbecdc92bda2dbc6fd8cd970 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Tue, 4 Feb 2025 10:20:19 +0200 Subject: [PATCH 11/11] cleanup --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7032bc5..e6ae83aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,15 +107,11 @@ jobs: path: allprebuilds - name: copy prebuilds run: | - ls - echo "---" - ls allprebuilds mkdir -p prebuilds cp -r allprebuilds/prebuilds-linux-arm64-*/* prebuilds cp -r allprebuilds/prebuilds-linux-*/* prebuilds cp -r allprebuilds/prebuilds-Windows-*/* prebuilds cp -r allprebuilds/prebuilds-macOS-*/* prebuilds - ls prebuilds - name: Install npm dependencies run: npm ci --ignore-scripts - name: Build