Merge b960715 into a111b06

Author: wrn14897

.changeset/config.json

@@ -6,6 +6,5 @@
   "linked": [],
   "access": "restricted",
   "baseBranch": "v2",
-  "updateInternalDependencies": "patch",
-  "ignore": ["@hyperdx/api", "@hyperdx/app"]
+  "updateInternalDependencies": "patch"
 }

.changeset/pre.json

@@ -0,0 +1,10 @@
+{
+  "mode": "pre",
+  "tag": "beta",
+  "initialVersions": {
+    "@hyperdx/api": "1.9.0",
+    "@hyperdx/app": "1.9.0",
+    "@hyperdx/common-utils": "0.1.0"
+  },
+  "changesets": ["famous-poets-rush", "perfect-nails-doubt", "taco-cat-v2"]
+}

.changeset/taco-cat-v2.md

@@ -0,0 +1,5 @@
+---
+"@hyperdx/app": major
+---
+
+bumps to v2 beta

.env

@@ -6,7 +6,8 @@ LOCAL_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-local
 LOCAL_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-local
 OTEL_COLLECTOR_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-otel-collector
 OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-otel-collector
-IMAGE_VERSION_SUB_TAG=.8
+CHANGESET_TAG=2.0.0-beta.9
+IMAGE_VERSION_SUB_TAG=.9
 IMAGE_VERSION=2-beta
 
 # Set up domain URLs

.github/workflows/release.yml

@@ -2,6 +2,8 @@ name: Release
 on:
   push:
     branches: [v2]
+  pull_request:
+    branches: [v2]
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 jobs:
   release:
@@ -10,6 +12,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Setup node
         uses: actions/setup-node@v4
         with:
@@ -23,18 +29,24 @@ jobs:
         uses: changesets/action@v1
         with:
           version: yarn run version
+          publish: yarn release
         env:
           YARN_ENABLE_IMMUTABLE_INSTALLS: false
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        continue-on-error: true
-      - name: Creating .npmrc
-        run: |
-          cat << EOF > "$HOME/.npmrc"
-            //registry.npmjs.org/:_authToken=$NPM_TOKEN
-          EOF
-        env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Publish
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Load environment variables from .env
+        uses: xom9ikk/dotenv@v2
+      - name: Publish images
         if: steps.changesets.outputs.hasChangesets == 'false'
-        # You can do something when a publish should happen.
-        run: yarn release
+        run: make release

package.json

@@ -35,7 +35,7 @@
     "dev": "yarn app:dev",
     "postdev": "docker compose -f docker-compose.dev.yml down",
     "lint": "npx nx run-many -t ci:lint",
-    "version": "npx changeset version && yarn",
+    "version": "npx changeset version && yarn && make version",
     "release": "npx nx run-many --target=build --projects=@hyperdx/common-utils && npx changeset publish"
   },
   "lint-staged": {

packages/api/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @hyperdx/api
 
+## 2.0.0-beta.0
+
 ## 1.9.0
 
 ### Minor Changes

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperdx/api",
-  "version": "1.9.0",
+  "version": "2.0.0-beta.9",
   "license": "MIT",
   "private": true,
   "engines": {

packages/app/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @hyperdx/app
 
+## 2.0.0-beta.0
+
+### Major Changes
+
+- bumps to v2 beta
+
+### Patch Changes
+
+- b3f3151: Allow to create Slack Webhooks from Team Settings page
+- b690db8: Introduce event panel overview tab
+
 ## 1.9.0
 
 ### Minor Changes

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperdx/app",
-  "version": "2-beta",
+  "version": "2.0.0-beta.9",
   "private": true,
   "license": "MIT",
   "engines": {

version.sh

@@ -13,11 +13,14 @@ if [ "$API_LATEST_VERSION" != "$APP_LATEST_VERSION" ]; then
 fi
 
 # update root package.json version
-sed -i '' -e "s/\"version\": \".*\"/\"version\": \"$API_LATEST_VERSION\"/g" ./package.json
+sed -i '' 's/\("version":\s*"\)[^"]*/\"$API_LATEST_VERSION\"/' package.json
 echo "Updated root package.json version to $API_LATEST_VERSION"
 
-# update .env IMAGE_VERSION
-sed -i '' -e "s/IMAGE_VERSION=.*/IMAGE_VERSION=$API_LATEST_VERSION/g" ./.env
-echo "Updated .env IMAGE_VERSION to $API_LATEST_VERSION"
+# update tags in .env 
+sed -i '' -e "s/CHANGESET_TAG=.*/CHANGESET_TAG=$API_LATEST_VERSION/g" ./.env
+echo "Updated .env CHANGESET_TAG to $API_LATEST_VERSION"
+
+sed -i '' -e "s/IMAGE_VERSION_SUB_TAG=.*/IMAGE_VERSION_SUB_TAG=${API_LATEST_VERSION##*-beta}/g" ./.env
+echo "Updated .env IMAGE_VERSION_SUB_TAG to ${API_LATEST_VERSION##*-beta}"
 
 echo "Run 'make release' to publish new version to GHCR"