Merge branch 'feature/zitify-federation' of github.com:openziti-incub…

…ator/prometheus into feature/zitify-federation
openziti-test-kitchen · Jan 3, 2022 · 5d1228e · 5d1228e
2 parents 66c553d + 61cdf0d
commit 5d1228e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,21 +13,21 @@ jobs:
       matrix:
         include:
          - os: ubuntu-latest
-           helm_artifact_name: prometheus
-           helm_asset_name: prometheus-linux-amd64
-#         - os: windows-latest
-#           helm_artifact_name: prometheus.exe
-#           helm_asset_name: prometheus-windows-amd64.exe
+           prometheus_artifact_name: prometheus
+           prometheus_asset_name: prometheus-linux-amd64
+         - os: windows-latest
+           prometheus_artifact_name: prometheus.exe
+           prometheus_asset_name: prometheus-windows-amd64.exe
          - os: macos-latest
-           helm_artifact_name: prometheus
-           helm_asset_name: prometheus-macos-amd64
+           prometheus_artifact_name: prometheus
+           prometheus_asset_name: prometheus-macos-amd64
     steps:
     - uses: actions/checkout@v2
 
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
 
     - name: Make the build dir
       run: mkdir "${{ runner.workspace }}/build"
@@ -36,24 +36,24 @@ jobs:
       run: make assets
 
     - name: Build
-      run: go build -o ${{ runner.workspace }}/build ./...
+      run: go build -o ${{ runner.workspace }}/build/${{ matrix.prometheus_artifact_name }} ./cmd/prometheus/main.go
 
     - name: make dir to tar
-      run: mkdir ${{ runner.workspace }}/{{ matrix.helm_artifact_name }}
+      run: mkdir ${{ matrix.prometheus_asset_name }}
 
     - name: move binary
-      run: mv ${{ runner.workspace }}/build/${{ matrix.helm_artifact_name }} ${{ runner.workspace }}/${{ matrix.helm_artifact_name }}/.
+      run: cp ${{ runner.workspace }}/build/${{ matrix.prometheus_artifact_name }} ${{ matrix.prometheus_asset_name }}/.
 
     - name: copy web
-      run: cp -R ${{ runner.workspace }}/web ${{ runner.workspace }}/${{ matrix.helm_artifact_name }}/.
+      run: cp -r ./web/ui/. ${{ matrix.prometheus_asset_name }}/.
 
     - name: tar
-      run: tar -zcvf ${{ matrix.helm_artifact_name }}.tar.gz ${{ runner.workspace }}/${{ matrix.helm_artifact_name }}
+      run: tar -zcvf ${{ matrix.prometheus_asset_name }}.tar.gz ${{ matrix.prometheus_asset_name }}
 
-    - name: Upload helm binaries to release
+    - name: Upload prometheus binaries to release
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: ${{ runner.workspace }}/build/${{ matrix.helm_artifact_name }}
-        asset_name: ${{ matrix.helm_asset_name }}
+        file: ${{ matrix.prometheus_asset_name }}.tar.gz
+        asset_name: ${{ matrix.prometheus_asset_name }}.tar.gz
         tag: ${{ github.ref }}
diff --git a/web/ui/react-app/.eslintrc.json b/web/ui/react-app/.eslintrc.json
@@ -6,6 +6,9 @@
     "plugin:prettier/recommended"
   ],
   "rules": {
+    "prettier/prettier": ["error",{
+      "endOfLine": "auto"}
+    ],
     "@typescript-eslint/explicit-function-return-type": ["off"],
     "eol-last": [
       "error",