Pull changes from upstream

.bazelrc

@@ -1,5 +1,4 @@
+build --nolegacy_external_runfiles
 build --verbose_failures
 test --test_output=errors
 
-# required for rules_docker 0.15
-common --incompatible_restrict_string_escapes=false

.bazelversion

@@ -1 +1 @@
-4.0.0
+6.5.0

.fasterci/config.yaml

@@ -3,12 +3,20 @@
 workflows:
 
   - &build_workflow
-    name: Faster CI / build (4.0.0)
-    image: us.gcr.io/fasterci/bazelbuilder:cd990e6
+    name: Faster CI / build (6.5.0)
+    env:
+      USE_BAZEL_VERSION: "6.5.0"
+    image: us.gcr.io/fasterci/bazelbuilder:5e59f651dbb5
     on:
       push:
+        branches:
+          - main
+      pull_request:
         branches:
           - "**"
+        from-branches-ignore:
+          # will ignore PRs from renovate bot, since the bot is not a repository collaborator
+          - "renovate/**"
     steps:
       - name: Build & test
         bazel:
@@ -27,11 +35,6 @@ workflows:
         run: bazel run //:buildifier-check
 
   - <<: *build_workflow
-    name: Faster CI / build (3.7.1)
-    env:
-      USE_BAZEL_VERSION: "3.7.1"
-
-  - <<: *build_workflow
-    name: Faster CI / build (4.2.1)
+    name: Faster CI / build (5.4.1)
     env:
-      USE_BAZEL_VERSION: "4.2.1"
+      USE_BAZEL_VERSION: "5.4.1"

.github/workflows/ci.yaml

@@ -3,25 +3,26 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
       - feature/*
   pull_request:
-    branches: [master]
+    branches: [main]
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         bazel-version:
-          - 3.7.1
-          - 4.0.0
+          - 6.5.0
+          - 5.4.1
     env:
       USE_BAZEL_VERSION: ${{ matrix.bazel-version }}
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
       - name: Mount Bazel cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.cache/bazel
           key: bazel-${{ matrix.bazel-version }}-${{ github.sha }}
@@ -32,11 +33,11 @@ jobs:
         run: |
           TOOLS_DIR="${HOME}/.cache/tools"
           mkdir -p "${TOOLS_DIR}/bin/"
-          curl -Ls -o "${TOOLS_DIR}/bin/bazel" "https://github.com/bazelbuild/bazelisk/releases/download/v1.3.0/bazelisk-linux-amd64"
+          curl -Ls -o "${TOOLS_DIR}/bin/bazel" "https://github.com/bazelbuild/bazelisk/releases/download/v1.14.0/bazelisk-linux-amd64"
           chmod +x "${TOOLS_DIR}/bin/bazel"
           curl -Ls -o "${TOOLS_DIR}/bin/buildifier" "https://github.com/bazelbuild/buildtools/releases/download/0.29.0/buildifier"
           chmod +x "${TOOLS_DIR}/bin/buildifier"
-          curl -Ls -o "${TOOLS_DIR}/bin/kind" "https://github.com/kubernetes-sigs/kind/releases/download/v0.11.1/kind-linux-amd64"
+          curl -Ls -o "${TOOLS_DIR}/bin/kind" "https://github.com/kubernetes-sigs/kind/releases/download/v0.29.0/kind-linux-amd64"
           chmod +x "${TOOLS_DIR}/bin/kind"
           echo "${TOOLS_DIR}/bin" >> $GITHUB_PATH
       - name: Setup kind cluster

.github/workflows/release.yml

@@ -0,0 +1,87 @@
+# Cut a release whenever a new tag is pushed to the repo.
+# You should use an annotated tag, like `git tag -a v1.2.3`
+# and put the release notes into the commit message for the tag.
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    env:
+      USE_BAZEL_VERSION: 6.5.0
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Mount Bazel cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/bazel
+          key: bazel-${{ env.USE_BAZEL_VERSION }}-${{ github.sha }}
+          restore-keys: |
+            bazel-${{ env.USE_BAZEL_VERSION }}-
+            bazel-
+      - name: Setup build tools
+        run: |
+          TOOLS_DIR="${HOME}/.cache/tools"
+          mkdir -p "${TOOLS_DIR}/bin/"
+          curl -Ls -o "${TOOLS_DIR}/bin/bazel" "https://github.com/bazelbuild/bazelisk/releases/download/v1.14.0/bazelisk-linux-amd64"
+          chmod +x "${TOOLS_DIR}/bin/bazel"
+          curl -Ls -o "${TOOLS_DIR}/bin/buildifier" "https://github.com/bazelbuild/buildtools/releases/download/0.29.0/buildifier"
+          chmod +x "${TOOLS_DIR}/bin/buildifier"
+          curl -Ls -o "${TOOLS_DIR}/bin/kind" "https://github.com/kubernetes-sigs/kind/releases/download/v0.29.0/kind-linux-amd64"
+          chmod +x "${TOOLS_DIR}/bin/kind"
+          echo "${TOOLS_DIR}/bin" >> $GITHUB_PATH
+      - name: Setup kind cluster
+        run: |
+          ./create_kind_cluster.sh
+      - name: Build
+        run: |
+          bazel build //...
+      - name: Check
+        # run downloaded version of buildifier to reduce uncached build times
+        # see: bazel run //:buildifier-check
+        run: |
+          find . -type f \(\
+            -name '*.bzl' \
+            -o -name '*.sky' \
+            -o -name BUILD \
+            -o -name BUILD.bazel \
+            -o -name WORKSPACE \
+            -o -name WORKSPACE.bazel \
+          \) | xargs buildifier \
+            -mode=check \
+            -lint=warn \
+            --warnings=-module-docstring,-function-docstring,-function-docstring-header,-function-docstring-args,-function-docstring-return,-print \
+          || {
+            buildifier_exit_code=$?
+            echo "Error: failed buildifier checks. Please run \"bazel run //:buildifier-fix\" and commit the changes."
+            exit $buildifier_exit_code
+          }
+      - name: Test
+        run: |
+          bazel test //...
+      - name: Build examples
+        run: |
+          cd examples
+          bazel build //...
+      - name: Test examples
+        run: |
+          cd examples
+          bazel test //...
+      - name: E2E
+        run: |
+          cd examples
+          ./e2e-test.sh
+      - name: Prepare workspace snippet
+        run: .github/workflows/workspace_snippet.sh ${{ env.GITHUB_REF_NAME }} > release_notes.txt
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          prerelease: true
+          # Use GH feature to populate the changelog automatically
+          generate_release_notes: true
+          body_path: release_notes.txt

.github/workflows/workspace_snippet.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -o errexit -o nounset -o pipefail
+
+TAG=${GITHUB_REF_NAME}
+PREFIX="rules_gitops-${TAG:1}"
+SHA=$(git archive --format=tar --prefix=${PREFIX}/ ${TAG} | gzip | shasum -a 256 | awk '{print $1}')
+
+cat << EOF
+
+WORKSPACE snippet:
+
+\`\`\`starlark
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "com_adobe_rules_gitops",
+    sha256 = "${SHA}",
+    strip_prefix = "${PREFIX}",
+    urls = ["https://github.com/adobe/rules_gitops/archive/refs/tags/${TAG}.tar.gz"],
+)
+EOF
+
+awk '/---SNIP---/{f=1;next}/---END_SNIP---/{f=0}f' examples/WORKSPACE
+echo "\`\`\`"

BUILD

@@ -10,12 +10,13 @@
 
 # gazelle:build_tags darwin,linux
 # gazelle:exclude examples
-
-licenses(["notice"])  # Apache 2.0
+# gazelle:proto disable_global
 
 load("@bazel_gazelle//:def.bzl", "gazelle")
 load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
 
+licenses(["notice"])  # Apache 2.0
+
 exports_files(["WORKSPACE"])
 
 # gazelle:prefix github.com/adobe/rules_gitops