From 92b06ad4fca7f36713ca66323b3fc078f4858258 Mon Sep 17 00:00:00 2001 From: Mike Christofilopoulos Date: Sat, 15 Feb 2020 17:55:40 +0000 Subject: [PATCH 1/5] added basicc checks --- .github/workflows/blank.yml | 16 ++++++---------- Makefile | 4 ++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml index d55c9a8..0e1927e 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/blank.yml @@ -9,13 +9,9 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Setup Node.js for use with actions - uses: actions/setup-node@v1.1.0 - - name: install codedown - run: npm install -g codedown - - name: get terraform-provider-aws - run: make terraform-provider-aws - - name: generate all - run: make - - name: test - run: ./options.sh | jq . + - name: add packages + run: | + apt-get update + apt-get install -y libxml2-utils + - name: test xml + run: make validate diff --git a/Makefile b/Makefile index 776c297..4d29b4b 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,10 @@ version: mversion: @git show origin/master:info.plist | grep version -A1 | tail -1 | grep -oP '[\d\.]*' +validate: + xmllint info.plist + awk '/items/,/<\/string/' info.plist | grep -v items | sed 's/.*string>\[/\[/g' | sed 's!!!g' | jq + all: @echo "Makefile needs your attention" From 0d187932b1471c0679bec15abea533e3b7549711 Mon Sep 17 00:00:00 2001 From: Mike Christofilopoulos Date: Sat, 15 Feb 2020 17:56:29 +0000 Subject: [PATCH 2/5] sudo apt --- .github/workflows/blank.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml index 0e1927e..5b7cd39 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/blank.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v1 - name: add packages run: | - apt-get update - apt-get install -y libxml2-utils + sudo apt-get update + sudo apt-get install -y libxml2-utils - name: test xml run: make validate From f6758a1d4efe3da3c56d94afea7e443abb1a63b4 Mon Sep 17 00:00:00 2001 From: Mike Christofilopoulos Date: Sat, 15 Feb 2020 18:07:04 +0000 Subject: [PATCH 3/5] added fragment target --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 4d29b4b..bdcc7fc 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,9 @@ validate: xmllint info.plist awk '/items/,/<\/string/' info.plist | grep -v items | sed 's/.*string>\[/\[/g' | sed 's!!!g' | jq +fragment: + @echo $(CURRENT_BRANCH) | tr -s '-' ' ' | cut -d ' ' -f1 + all: @echo "Makefile needs your attention" From 5802dd911f5b75694b3783a2b4878daf747cf3e5 Mon Sep 17 00:00:00 2001 From: Mike Christofilopoulos Date: Sat, 15 Feb 2020 18:07:37 +0000 Subject: [PATCH 4/5] added default vault for git branch --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index bdcc7fc..9a7438d 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ SHELL := bash .SHELLFLAGS := -eu -o pipefail -c .ONESHELL: +CURRENT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) pbpaste.alfredworkflow: git archive --format zip HEAD > pbpaste.alfredworkflow From 3c293ff42ab7ed06a7a106e7d36e78576350099a Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 15 Feb 2020 18:08:14 +0000 Subject: [PATCH 5/5] bumped version --- info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.plist b/info.plist index 61d7005..23f02aa 100644 --- a/info.plist +++ b/info.plist @@ -150,7 +150,7 @@ variablesdontexport version - 0.1.0 + 0.1.1 webaddress