Build: adds missing filters required to build oss msi (#21618)

(cherry picked from commit 7e0890d57d)

.circleci/config.yml

@@ -1211,6 +1211,7 @@ workflows:
             - shellcheck
             - mysql-integration-test
             - postgres-integration-test
+          filters: *filter-only-master
       - build-ee-msi:
           requires:
             - build-all-enterprise
@@ -1323,6 +1324,7 @@ workflows:
             - shellcheck
             - mysql-integration-test
             - postgres-integration-test
+          filters: *filter-only-release
       - build-ee-msi:
           requires:
             - build-all-enterprise

lerna.json

@@ -2,5 +2,5 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
-  "version": "6.6.0-pre"
+  "version": "6.6.0-beta.1.0"
 }

package.json

@@ -3,7 +3,7 @@
   "license": "Apache-2.0",
   "private": true,
   "name": "grafana",
-  "version": "6.6.0-pre",
+  "version": "6.6.0-beta1",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git"

packages/grafana-data/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/data",
-  "version": "6.6.0-pre",
+  "version": "6.6.0-beta.1.0",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"

packages/grafana-e2e/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e",
-  "version": "6.4.0-pre",
+  "version": "6.6.0-beta.1.0",
   "description": "Grafana End to End Test Library",
   "keywords": [
     "grafana",

packages/grafana-runtime/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/runtime",
-  "version": "6.6.0-pre",
+  "version": "6.6.0-beta.1.0",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -21,8 +21,8 @@
     "build": "grafana-toolkit package:build --scope=runtime"
   },
   "dependencies": {
-    "@grafana/data": "^6.6.0-pre",
+    "@grafana/data": "6.6.0-beta.1.0",
-    "@grafana/ui": "^6.6.0-pre",
+    "@grafana/ui": "6.6.0-beta.1.0",
     "systemjs": "0.20.19",
     "systemjs-plugin-css": "0.1.37"
   },

packages/grafana-toolkit/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/toolkit",
-  "version": "6.6.0-pre",
+  "version": "6.6.0-beta.1.0",
   "description": "Grafana Toolkit",
   "keywords": [
     "grafana",
@@ -28,8 +28,8 @@
   "dependencies": {
     "@babel/core": "7.6.4",
     "@babel/preset-env": "7.6.3",
-    "@grafana/data": "^6.6.0-pre",
+    "@grafana/data": "6.6.0-beta.1.0",
-    "@grafana/ui": "^6.6.0-pre",
+    "@grafana/ui": "6.6.0-beta.1.0",
     "@types/command-exists": "^1.2.0",
     "@types/execa": "^0.9.0",
     "@types/expect-puppeteer": "3.3.1",
@@ -65,6 +65,8 @@
     "jest-cli": "^24.8.0",
     "jest-coverage-badges": "^1.1.2",
     "jest-junit": "^6.4.0",
+    "less": "^3.10.3",
+    "less-loader": "^5.0.0",
     "lodash": "4.17.15",
     "md5-file": "^4.0.0",
     "mini-css-extract-plugin": "^0.7.0",
@@ -95,9 +97,7 @@
     "tslint-config-prettier": "^1.18.0",
     "typescript": "3.7.2",
     "url-loader": "^2.0.1",
-    "webpack": "4.35.0",
+    "webpack": "4.35.0"
-    "less": "^3.10.3",
-    "less-loader": "^5.0.0"
   },
   "_moduleAliases": {
     "puppeteer": "node_modules/puppeteer-core"

packages/grafana-ui/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/ui",
-  "version": "6.6.0-pre",
+  "version": "6.6.0-beta.1.0",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -25,7 +25,7 @@
     "build": "grafana-toolkit package:build --scope=ui"
   },
   "dependencies": {
-    "@grafana/data": "^6.6.0-pre",
+    "@grafana/data": "6.6.0-beta.1.0",
     "@grafana/slate-react": "0.22.9-grafana",
     "@torkelo/react-select": "2.1.1",
     "@types/react-color": "2.17.0",

scripts/build/publish.sh

@@ -8,8 +8,8 @@ EXTRA_OPTS="$@"
 
 # Right now we hack this in into the publish script.
 # Eventually we might want to keep a list of all previous releases somewhere.
-_releaseNoteUrl="https://community.grafana.com/t/release-notes-v6-0-x/14010"
+_releaseNoteUrl="https://community.grafana.com/t/release-notes-v6-6-x/24924"
-_whatsNewUrl="http://docs.grafana.org/guides/whats-new-in-v6-0/"
+_whatsNewUrl="http://docs.grafana.org/guides/whats-new-in-v6-6/"
 
 ./scripts/build/release_publisher/release_publisher \
     --wn "${_whatsNewUrl}" \