Merge pull request #8 from kindlyops/bazel-skylib

Support development on Windows using bazel and powershell

Author: statik

.github/workflows/ci.yaml

@@ -20,7 +20,7 @@ jobs:
           token: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
           ref: ${{ github.head_ref }}
       - name: bazel build
-        run: bazel run :install
+        run: bazel build //...
       - name: Sync Dependencies
         run: bazel run //:vendor
         if: github.actor == 'dependabot-preview[bot]'
@@ -41,19 +41,19 @@ jobs:
       - name: dry run goreleaser
         uses: goreleaser/goreleaser-action@master
         env:
-          GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
+          POWERSHELL_TELEMETRY_OPTOUT: true
         with:
           version: latest
           args: release --snapshot --skip-publish
       - uses: actions/upload-artifact@v2
         with:
           name: vbs-snapshot-macos
-          path: bdist/vbs-darwin
+          path: bazel-bin/bdist/vbs_darwin_amd64/vbs
       - uses: actions/upload-artifact@v2
         with:
           name: vbs-snapshot-windows
-          path: bdist/vbs-windows.exe
+          path: bazel-bin/bdist/vbs_windows_amd64/vbs.exe
       - uses: actions/upload-artifact@v2
         with:
           name: vbs-snapshot-linux
-          path: bdist/vbs-linux
+          path:  bazel-bin/bdist/vbs_linux_amd64/vbs

.github/workflows/release-publisher.yml

@@ -30,6 +30,7 @@ jobs:
       - name: Run goreleaser
         uses: goreleaser/goreleaser-action@master
         env:
+          POWERSHELL_TELEMETRY_OPTOUT: true
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
         with:
           version: latest

.goreleaser.yml

@@ -11,7 +11,7 @@ builds:
       - amd64
     binary: vbs
     hooks:
-      post: ./goreleaser-post-hook.sh
+      post: pwsh goreleaser-post-hook.ps1
 
 checksum:
   name_template: 'checksums.txt'

BUILD.bazel

@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
 load("@bazel_gazelle//:def.bzl", "gazelle")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
 load("//:version.bzl", "VERSION")
+load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 
 # gazelle:prefix github.com/kindlyops/vbs
 # gazelle:exclude dummy.go
@@ -51,25 +51,35 @@ go_binary(
     },
 )
 
-pkg_tar(
-    name = "bdist",
-    srcs = [
-        "//:vbs-darwin",
-        "//:vbs-linux",
-        "//:vbs-windows",
-    ],
-    tags = ["manual"],
-    visibility = ["//visibility:private"],
+alias(
+    name = "vbs",
+    actual = select({
+        "@io_bazel_rules_go//go/platform:linux_amd64": ":vbs-linux",
+        "@io_bazel_rules_go//go/platform:darwin_amd64": ":vbs-darwin",
+        "@io_bazel_rules_go//go/platform:windows_amd64": ":vbs-windows",
+        "//conditions:default": ":vbs-linux",
+    }),
 )
 
-sh_binary(
-    name = "install",
-    srcs = ["install.sh"],
-    args = ["$(location :bdist.tar)"],
-    data = [":bdist.tar"],
-    tags = ["manual"],
+copy_file(
+    name = "install-darwin",
+    src = "//:vbs-darwin",
+    out = "bdist/vbs_darwin_amd64/vbs",
 )
 
+copy_file(
+    name = "install-linux",
+    src = "//:vbs-linux",
+    out = "bdist/vbs_linux_amd64/vbs",
+)
+
+copy_file(
+    name = "install-windows",
+    src = "//:vbs-windows",
+    out = "bdist/vbs_windows_amd64/vbs.exe",
+)
+
+
 go_test(
     name = "go_default_test",
     size = "small",
@@ -81,6 +91,9 @@ go_test(
         "@io_bazel_rules_go//go/platform:darwin_amd64": [
             "$(location :vbs-darwin)",
         ],
+        "@io_bazel_rules_go//go/platform:windows_amd64": [
+            "$(location :vbs-windows)",
+        ],
         "//conditions:default": [],
     }),
     data = select({
@@ -90,6 +103,9 @@ go_test(
         "@io_bazel_rules_go//go/platform:darwin_amd64": [
             ":vbs-darwin",
         ],
+        "@io_bazel_rules_go//go/platform:windows_amd64": [
+            ":vbs-windows",
+        ],
         "//conditions:default": [],
     }),
     embed = [":go_default_library"],

WORKSPACE

@@ -50,11 +50,12 @@ http_archive(
 )
 
 http_archive(
-    name = "rules_pkg",
-    sha256 = "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a",
-    url = "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
+    name = "bazel_skylib",
+    urls = [
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+    ],
+    sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
 )
-
-load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-
-rules_pkg_dependencies()
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+bazel_skylib_workspace()

bdist/.gitkeep

@@ -54,7 +54,7 @@ use at your own risk.
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute(v string) {
-	rootCmd.SetVersionTemplate(v)
+	rootCmd.SetVersionTemplate(v + "\n")
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)

cmd/root.go

@@ -0,0 +1,10 @@
+#!/usr/bin/env pwsh
+
+Write-Output "moving bazel outputs to goreleaser dist directory for packaging..."
+
+# this gets invoked several times by goreleaser, we already have all the artifacts
+# from bazel so just copy them once
+if (-Not (Test-Path (Resolve-Path "dist"))) {
+  New-Item -Force -Path (Get-Location).Path -Name "dist"
+  Copy-Item (Resolve-Path "bazel-bin/bdist/*") -Destination (Resolve-Path "dist") -Recurse -Force
+}