unify build and package

grafana · Sep 30, 2024 · f334ef0 · f334ef0
1 parent 6ada101
commit f334ef0
Showing 1 changed file with 8 additions and 28 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -30,30 +30,6 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: 1.21.8
-      - name: Install go-bindata
-        run: go install github.com/go-bindata/go-bindata/...@latest
-      - run: make LINUX_PACKAGE_GOARCH=amd64 build-linux
-      - run: make LINUX_PACKAGE_GOARCH=arm64 build-linux
-      - run: make build-win
-      - run: make build-darwin
-      - run: make build-bsd
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-artifacts
-          path: |
-            carbon-relay-ng
-            carbon-relay-ng.exe
-            carbon-relay-ng-darwin
-            carbon-relay-ng-linux-amd64
-            carbon-relay-ng-linux-arm64
-            carbon-relay-ng-bsd
-
-  package:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.3
@@ -62,10 +38,13 @@ jobs:
           sudo apt-get update
           sudo apt-get install rpm
           gem install fpm
-      - name: Download build artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: build-artifacts
+      - name: Install go-bindata
+        run: go install github.com/go-bindata/go-bindata/...@latest
+      - run: make LINUX_PACKAGE_GOARCH=amd64 build-linux
+      - run: make LINUX_PACKAGE_GOARCH=arm64 build-linux
+      - run: make build-win
+      - run: make build-darwin
+      - run: make build-bsd
       - name: Make packages
         run: make packages
       - name: Build Docker image
@@ -77,6 +56,7 @@ jobs:
       - name: Upload package artifacts
         uses: actions/upload-artifact@v3
         with:
+          include-hidden-files: true
           name: package-artifacts
           path: build