From 8c3eb28ce3f58f238f07986b4b69e3483e79bf50 Mon Sep 17 00:00:00 2001 From: Erik Osterman Date: Fri, 20 Mar 2020 16:14:23 -0700 Subject: [PATCH] Auto badge (#346) * Update badges * Update badges --- README.md | 2 +- README.yaml | 7 +++++-- tasks/Makefile.package | 2 +- vendor/sentinel/Makefile | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4460075ae..5dd8f591f 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ [![Cloud Posse][logo]](https://cpco.io/homepage) -# Packages [![Codefresh Build Status](https://g.codefresh.io/api/badges/pipeline/cloudposse/cloudposse%2Fpackages%2Fapk?type=cf-1)](https://g.codefresh.io/public/accounts/cloudposse/pipelines/5baae099b35f251ecadf1fa0) [![Latest Release](https://img.shields.io/github/release/cloudposse/packages.svg)](https://github.com/cloudposse/packages/releases/latest) [![Slack Community](https://slack.cloudposse.com/badge.svg)](https://slack.cloudposse.com) +# Packages [![Codefresh Build Status](https://g.codefresh.io/api/badges/pipeline/cloudposse/cloudposse%2Fpackages%2Fapk?branch=master&key=eyJhbGciOiJIUzI1NiJ9.NWEwMTJmNWM3Yjg3YTQwMDAxYTlkMjU0.UwxTSXZGXq3wPQjj3O1k71kQsGuWGlzgkp9V2-llce8&type=cf-1)](https://g.codefresh.io/pipelines/apk/builds?repoOwner=cloudposse&repoName=packages&serviceName=cloudposse%2Fpackages&filter=trigger:build~Build;branch:master;pipeline:5baae099b35f251ecadf1fa0~apk) [![Auto Update Status](https://github.com/cloudposse/packages/workflows/auto-update/badge.svg)](https://github.com/cloudposse/packages/actions?query=workflow%3Aauto-update) [![Latest Release](https://img.shields.io/github/release/cloudposse/packages.svg)](https://github.com/cloudposse/packages/releases/latest) [![Slack Community](https://slack.cloudposse.com/badge.svg)](https://slack.cloudposse.com) Cloud Posse distribution of awesome apps. diff --git a/README.yaml b/README.yaml index 2b68302db..71a75832e 100644 --- a/README.yaml +++ b/README.yaml @@ -26,8 +26,11 @@ github_repo: cloudposse/packages # Badges to display badges: - name: "Codefresh Build Status" - image: "https://g.codefresh.io/api/badges/pipeline/cloudposse/cloudposse%2Fpackages%2Fapk?type=cf-1" - url: "https://g.codefresh.io/public/accounts/cloudposse/pipelines/5baae099b35f251ecadf1fa0" + image: "https://g.codefresh.io/api/badges/pipeline/cloudposse/cloudposse%2Fpackages%2Fapk?branch=master&key=eyJhbGciOiJIUzI1NiJ9.NWEwMTJmNWM3Yjg3YTQwMDAxYTlkMjU0.UwxTSXZGXq3wPQjj3O1k71kQsGuWGlzgkp9V2-llce8&type=cf-1" + url: "https://g.codefresh.io/pipelines/apk/builds?repoOwner=cloudposse&repoName=packages&serviceName=cloudposse%2Fpackages&filter=trigger:build~Build;branch:master;pipeline:5baae099b35f251ecadf1fa0~apk" + - name: "Auto Update Status" + image: "https://github.com/cloudposse/packages/workflows/auto-update/badge.svg" + url: "https://github.com/cloudposse/packages/actions?query=workflow%3Aauto-update" - name: "Latest Release" image: "https://img.shields.io/github/release/cloudposse/packages.svg" url: "https://github.com/cloudposse/packages/releases/latest" diff --git a/tasks/Makefile.package b/tasks/Makefile.package index 28e116fa4..7052666dc 100644 --- a/tasks/Makefile.package +++ b/tasks/Makefile.package @@ -150,7 +150,7 @@ auto-update: # Update the VERSION file only if it would change, to avoid triggering unnecessary builds CURRENT_VERSION: API=releases/latest CURRENT_VERSION: QUERY=.tag_name -CURRENT_VERSION: +CURRENT_VERSION:: @local_version=$$(cat VERSION || echo 0); \ current_version=$$(env PATH='$(PATH)' github-repo-metadata $(VENDOR) $(PACKAGE_REPO_NAME) '$(API)' '$(QUERY)' | sed 's/^v//'); \ if [ $$? -ne 0 ]; then \ diff --git a/vendor/sentinel/Makefile b/vendor/sentinel/Makefile index 8f595b7aa..d0301b88c 100644 --- a/vendor/sentinel/Makefile +++ b/vendor/sentinel/Makefile @@ -11,7 +11,7 @@ export PACKAGE_NAME ?= sentinel export DOWNLOAD_URL ?= https://releases.hashicorp.com/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(OS)_$(ARCH).zip export APK_BUILD_TEMPLATE ?= APKBUILD.github-binary -CURRENT_VERSION: +CURRENT_VERSION:: @local_version=$$(cat VERSION || echo 0); \ current_version=$$(curl -s "https://releases.hashicorp.com/$(PACKAGE_NAME)/" | sed -nE 's/.*\