From a8c58d0c10ba61b11bdc091d866764cdbcb6c6bb Mon Sep 17 00:00:00 2001 From: MartenH <72463136+mhennoch@users.noreply.github.com> Date: Tue, 4 Feb 2025 11:05:21 +0200 Subject: [PATCH] chore: release v3.0.1 (#1007) * chore: release v3.0.1 * Upgrade actions/upload-artifact * Fix upload/download * Upgrade download also * Fix * Simplify * final * fix path * log * Fix mac * cleanup --- .github/workflows/ci.yml | 35 ++++++++++++++++++++--------------- CHANGELOG.md | 5 +++++ package-lock.json | 4 ++-- package.json | 2 +- src/version.ts | 2 +- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 753b4c81..e6ae83aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,10 +29,11 @@ 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 + name: prebuilds-linux-${{ matrix.node_api_target }} path: prebuilds + prebuilds-linux-arm64: runs-on: [self-hosted, Linux, ARM64] strategy: @@ -53,9 +54,9 @@ 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 + name: prebuilds-linux-arm64-${{ matrix.node_api_target }} path: prebuilds prebuilds-macos-windows: @@ -82,13 +83,13 @@ 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 + name: prebuilds-${{ runner.os }}-${{ matrix.node_api_target }} path: prebuilds create-package: - needs: [prebuilds-linux, prebuilds-macos-windows, prebuilds-linux-arm64] + needs: [prebuilds-linux, prebuilds-linux-arm64, prebuilds-macos-windows] runs-on: ubuntu-latest steps: - name: Checkout @@ -99,14 +100,18 @@ jobs: - uses: actions/setup-node@v3 with: node-version: '16' - - name: download prebuilds - uses: actions/download-artifact@v3 + - name: Download all prebuilds + uses: actions/download-artifact@v4 + with: + pattern: prebuilds-* + path: allprebuilds - name: copy prebuilds run: | - mkdir -p prebuilds - cp -r prebuilds-linux/* prebuilds - cp -r prebuilds-macos-windows/* prebuilds - cp -r prebuilds-linux-arm64/* 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 allprebuilds/prebuilds-macOS-*/* prebuilds - name: Install npm dependencies run: npm ci --ignore-scripts - name: Build @@ -116,7 +121,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 +201,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 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';