fix rock and ci (#11)

canonical · Oct 19, 2023 · 955c911 · 955c911
1 parent 9bdd075
commit 955c911
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/rock-update.yaml b/.github/workflows/rock-update.yaml
@@ -12,9 +12,3 @@ jobs:
       rock-name: prometheus-pushgateway
       source-repo: prometheus/pushgateway
       check-go: true
-      update-script: |
-        # The caller must provide \$application_src and \$rockcraft_yaml
-        #   \$application_src: The root folder of the cloned upstream project
-        #   \$rockcraft_yaml: Path of the rockcraft.yaml to update
-        #
-        ## Node dependency
diff --git a/1.6.0/rockcraft.yaml b/1.6.0/rockcraft.yaml
@@ -7,14 +7,14 @@ base: ubuntu:22.04
 build-base: ubuntu:22.04
 license: Apache-2.0
 services:
-  pushgateway:
+  prometheus-pushgateway:
     command: /bin/pushgateway
     override: replace
     startup: enabled
 platforms:
   amd64:
 parts:
-  pushgateway:
+  prometheus-pushgateway:
     plugin: go
     source: https://github.com/prometheus/pushgateway
     source-type: git
@@ -27,7 +27,7 @@ parts:
       make build
       install -D -m755 pushgateway ${CRAFT_PART_INSTALL}/bin/pushgateway
     organize:
-      pushgateway: bin/pushgateway
+      prometheus-pushgateway: bin/pushgateway
   # We moved this here because: https://github.com/canonical/rockcraft/issues/343
   ca-certs:
     plugin: nil

diff --git a/1.6.1/rockcraft.yaml b/1.6.1/rockcraft.yaml
@@ -7,14 +7,14 @@ base: ubuntu:22.04
 build-base: ubuntu:22.04
 license: Apache-2.0
 services:
-  pushgateway:
+  prometheus-pushgateway:
     command: /bin/pushgateway
     override: replace
     startup: enabled
 platforms:
   amd64:
 parts:
-  pushgateway:
+  prometheus-pushgateway:
     plugin: go
     source: https://github.com/prometheus/pushgateway
     source-type: git
@@ -27,7 +27,7 @@ parts:
       make build
       install -D -m755 pushgateway ${CRAFT_PART_INSTALL}/bin/pushgateway
     organize:
-      pushgateway: bin/pushgateway
+      prometheus-pushgateway: bin/pushgateway
   # We moved this here because: https://github.com/canonical/rockcraft/issues/343
   ca-certs:
     plugin: nil

diff --git a/1.6.2/rockcraft.yaml b/1.6.2/rockcraft.yaml
@@ -7,18 +7,18 @@ base: ubuntu:22.04
 build-base: ubuntu:22.04
 license: Apache-2.0
 services:
-  pushgateway:
+  prometheus-pushgateway:
     command: /bin/pushgateway
     override: replace
     startup: enabled
 platforms:
   amd64:
 parts:
-  pushgateway:
+  prometheus-pushgateway:
     plugin: go
     source: https://github.com/prometheus/pushgateway
     source-type: git
-    source-tag: "v1.6.1"
+    source-tag: "v1.6.2"
     build-snaps:
       - go/1.19/stable
     build-packages:
@@ -27,7 +27,7 @@ parts:
       make build
       install -D -m755 pushgateway ${CRAFT_PART_INSTALL}/bin/pushgateway
     organize:
-      pushgateway: bin/pushgateway
+      prometheus-pushgateway: bin/pushgateway
   # We moved this here because: https://github.com/canonical/rockcraft/issues/343
   ca-certs:
     plugin: nil

diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # prometheus-pushgateway-rock
 
+[![Open a PR to OCI Factory](https://github.com/canonical/prometheus-pushgateway-rock/actions/workflows/rock-release-oci-factory.yaml/badge.svg)](https://github.com/canonical/prometheus-pushgateway-rock/actions/workflows/rock-release-oci-factory.yaml)
 [![Publish to GHCR:dev](https://github.com/canonical/prometheus-pushgateway-rock/actions/workflows/rock-release-dev.yaml/badge.svg)](https://github.com/canonical/prometheus-pushgateway-rock/actions/workflows/rock-release-dev.yaml)
 [![Update ROCK](https://github.com/canonical/prometheus-pushgateway-rock/actions/workflows/rock-update.yaml/badge.svg)](https://github.com/canonical/prometheus-pushgateway-rock/actions/workflows/rock-update.yaml)