Merge pull request #456 from tweag/cg/fix_status_badge

chore: schedule daily CI run and add status badge tied to daily CI run
tweag · Nov 29, 2023 · 940c733 · 940c733
2 parents db54298 + 9c7a386
commit 940c733
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 44 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -7,6 +7,8 @@ on:
     branches: master
   workflow_dispatch: # allows manual triggering
   workflow_call: # allows call from another workflow
+  schedule:
+    - cron: '1 11 * * *'
 
 jobs:
   cancel-running-workflows:

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 # Nixpkgs rules for Bazel
 
-[![Continuous integration](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml/badge.svg)](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml)
+[![Continuous integration](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml/badge.svg?event=schedule)](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml)
 
 Use [Nix][nix] and the [Nixpkgs][nixpkgs] package set to import
 external dependencies (like system packages) into [Bazel][bazel]

diff --git a/core/README.md b/core/README.md
@@ -4,7 +4,7 @@
 
 # Nixpkgs rules for Bazel
 
-[![Continuous integration](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml/badge.svg)](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml)
+[![Continuous integration](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml/badge.svg?event=schedule)](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml)
 
 Use [Nix][nix] and the [Nixpkgs][nixpkgs] package set to import
 external dependencies (like system packages) into [Bazel][bazel]

diff --git a/core/nixpkgs.bzl b/core/nixpkgs.bzl
@@ -2,7 +2,7 @@
 
 # Nixpkgs rules for Bazel
 
-[![Continuous integration](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml/badge.svg)](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml)
+[![Continuous integration](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml/badge.svg?event=schedule)](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml)
 
 Use [Nix][nix] and the [Nixpkgs][nixpkgs] package set to import
 external dependencies (like system packages) into [Bazel][bazel]
@@ -85,16 +85,16 @@ def _nixpkgs_http_repository_impl(repository_ctx):
 _nixpkgs_http_repository = repository_rule(
     implementation = _nixpkgs_http_repository_impl,
     attrs = {
+        "auth": attr.string_dict(),
+        "integrity": attr.string(),
+        "sha256": attr.string(),
+        "strip_prefix": attr.string(),
         # The workspace name as specified by the user. Needed for bzlmod
         # compatibility, as other means of retrieving the name only return the
         # mangled name, not the user defined name.
         "unmangled_name": attr.string(mandatory = True),
         "url": attr.string(),
         "urls": attr.string_list(),
-        "auth": attr.string_dict(),
-        "strip_prefix": attr.string(),
-        "integrity": attr.string(),
-        "sha256": attr.string(),
     },
 )
 
@@ -326,14 +326,14 @@ import nixpkgs
 _nixpkgs_local_repository = repository_rule(
     implementation = _nixpkgs_local_repository_impl,
     attrs = {
+        "nix_file": attr.label(allow_single_file = [".nix"]),
+        "nix_file_content": attr.string(),
+        "nix_file_deps": attr.label_list(),
+        "nix_flake_lock_file": attr.label(allow_single_file = [".lock"]),
         # The workspace name as specified by the user. Needed for bzlmod
         # compatibility, as other means of retrieving the name only return the
         # mangled name, not the user defined name.
         "unmangled_name": attr.string(mandatory = True),
-        "nix_file": attr.label(allow_single_file = [".nix"]),
-        "nix_file_deps": attr.label_list(),
-        "nix_file_content": attr.string(),
-        "nix_flake_lock_file": attr.label(allow_single_file = [".lock"]),
     },
 )
 
@@ -591,23 +591,23 @@ def _nixpkgs_package_impl(repository_ctx):
 _nixpkgs_package = repository_rule(
     implementation = _nixpkgs_package_impl,
     attrs = {
-        # The workspace name as specified by the user. Needed for bzlmod
-        # compatibility, as other means of retrieving the name only return the
-        # mangled name, not the user defined name.
-        "unmangled_name": attr.string(mandatory = True),
         "attribute_path": attr.string(),
-        "nix_file": attr.label(allow_single_file = [".nix"]),
-        "nix_file_deps": attr.label_keyed_string_dict(),
-        "nix_file_content": attr.string(),
-        "repositories": attr.label_keyed_string_dict(),
-        "repository": attr.label(),
         "build_file": attr.label(),
         "build_file_content": attr.string(),
-        "nixopts": attr.string_list(),
-        "quiet": attr.bool(),
         "fail_not_supported": attr.bool(default = True, doc = """
             If set to True (default) this rule will fail on platforms which do not support Nix (e.g. Windows). If set to False calling this rule will succeed but no output will be generated.
                                         """),
+        "nix_file": attr.label(allow_single_file = [".nix"]),
+        "nix_file_content": attr.string(),
+        "nix_file_deps": attr.label_keyed_string_dict(),
+        "nixopts": attr.string_list(),
+        "quiet": attr.bool(),
+        "repositories": attr.label_keyed_string_dict(),
+        "repository": attr.label(),
+        # The workspace name as specified by the user. Needed for bzlmod
+        # compatibility, as other means of retrieving the name only return the
+        # mangled name, not the user defined name.
+        "unmangled_name": attr.string(mandatory = True),
     },
 )
 
@@ -795,18 +795,18 @@ def _nixpkgs_flake_package_impl(repository_ctx):
 _nixpkgs_flake_package = repository_rule(
     implementation = _nixpkgs_flake_package_impl,
     attrs = {
-        "nix_flake_file": attr.label(mandatory = True, allow_single_file = ["flake.nix"]),
-        "nix_flake_lock_file": attr.label(mandatory = True, allow_single_file = ["flake.lock"]),
-        "nix_flake_file_deps": attr.label_keyed_string_dict(),
-        "package": attr.string(doc = "Defaults to `default`"),
         "build_file": attr.label(),
         "build_file_content": attr.string(),
-        "nixopts": attr.string_list(),
-        "quiet": attr.bool(),
         "fail_not_supported": attr.bool(default = True, doc = """
             If set to True (default) this rule will fail on platforms which do not support Nix (e.g. Windows). If set to False calling this rule will succeed but no output will be generated.
         """),
         "legacy_path_syntax": attr.bool(default = False),
+        "nix_flake_file": attr.label(mandatory = True, allow_single_file = ["flake.nix"]),
+        "nix_flake_file_deps": attr.label_keyed_string_dict(),
+        "nix_flake_lock_file": attr.label(mandatory = True, allow_single_file = ["flake.lock"]),
+        "nixopts": attr.string_list(),
+        "package": attr.string(doc = "Defaults to `default`"),
+        "quiet": attr.bool(),
     },
 )
 

diff --git a/nixpkgs/nixpkgs.bzl b/nixpkgs/nixpkgs.bzl
@@ -2,7 +2,7 @@
 
 # Nixpkgs rules for Bazel
 
-[![Continuous integration](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml/badge.svg)](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml)
+[![Continuous integration](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml/badge.svg?event=schedule)](https://github.com/tweag/rules_nixpkgs/actions/workflows/workflow.yaml)
 
 Use [Nix][nix] and the [Nixpkgs][nixpkgs] package set to import
 external dependencies (like system packages) into [Bazel][bazel]
@@ -113,10 +113,15 @@ nixpkgs_package(
 ```
 """
 
+load("@bazel_tools//tools/cpp:cc_configure.bzl", "cc_autoconf_impl")
 load(
     "@bazel_tools//tools/cpp:lib_cc_configure.bzl",
     "get_cpu_value",
 )
+load(
+    "@rules_nixpkgs_cc//:cc.bzl",
+    _nixpkgs_cc_configure = "nixpkgs_cc_configure",
+)
 load(
     "@rules_nixpkgs_core//:nixpkgs.bzl",
     _nixpkgs_flake_package = "nixpkgs_flake_package",
@@ -125,38 +130,33 @@ load(
     _nixpkgs_local_repository = "nixpkgs_local_repository",
     _nixpkgs_package = "nixpkgs_package",
 )
-load("@bazel_tools//tools/cpp:cc_configure.bzl", "cc_autoconf_impl")
 load(
     "@rules_nixpkgs_core//:util.bzl",
     "execute_or_fail",
     "find_children",
     "is_supported_platform",
 )
-load(
-    "@rules_nixpkgs_python//:python.bzl",
-    _nixpkgs_python_configure = "nixpkgs_python_configure",
-    _nixpkgs_python_repository = "nixpkgs_python_repository",
-)
 load(
     "@rules_nixpkgs_java//:java.bzl",
     _nixpkgs_java_configure = "nixpkgs_java_configure",
 )
 load(
-    "@rules_nixpkgs_cc//:cc.bzl",
-    _nixpkgs_cc_configure = "nixpkgs_cc_configure",
-)
-load(
-    "@rules_nixpkgs_rust//:rust.bzl",
-    _nixpkgs_rust_configure = "nixpkgs_rust_configure",
+    "@rules_nixpkgs_nodejs//:nodejs.bzl",
+    _nixpkgs_nodejs_configure = "nixpkgs_nodejs_configure",
+    _nixpkgs_nodejs_configure_platforms = "nixpkgs_nodejs_configure_platforms",
 )
 load(
     "@rules_nixpkgs_posix//:posix.bzl",
     _nixpkgs_sh_posix_configure = "nixpkgs_sh_posix_configure",
 )
 load(
-    "@rules_nixpkgs_nodejs//:nodejs.bzl",
-    _nixpkgs_nodejs_configure = "nixpkgs_nodejs_configure",
-    _nixpkgs_nodejs_configure_platforms = "nixpkgs_nodejs_configure_platforms",
+    "@rules_nixpkgs_python//:python.bzl",
+    _nixpkgs_python_configure = "nixpkgs_python_configure",
+    _nixpkgs_python_repository = "nixpkgs_python_repository",
+)
+load(
+    "@rules_nixpkgs_rust//:rust.bzl",
+    _nixpkgs_rust_configure = "nixpkgs_rust_configure",
 )
 
 # aliases for backwards compatibility prior to `bzlmod`