Compare commits
1 Commits
4a5a24e402
...
360718a731
| Author | SHA1 | Date | |
|---|---|---|---|
| 360718a731 |
@ -9,17 +9,10 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: almalinux-8
|
runs-on: almalinux-8
|
||||||
container:
|
container:
|
||||||
image: git.query.consul/unkin/almalinux8:latest
|
image: git.query.consul/unkin/almalinux9-actionsdind:latest
|
||||||
options: --privileged
|
options: --privileged
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set up environment
|
|
||||||
run: |
|
|
||||||
dnf install -y yum-utils
|
|
||||||
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
|
|
||||||
dnf module enable -y nodejs:20
|
|
||||||
dnf install -y docker-ce-cli make bash git nodejs
|
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
|
|||||||
2
Makefile
2
Makefile
@ -44,6 +44,8 @@ $(DIRS):
|
|||||||
eval $$(vault kv get -format=json kv/service/packer/builder/env | jq -r '.data.data | to_entries[] | "export \(.key)=\(.value)"')
|
eval $$(vault kv get -format=json kv/service/packer/builder/env | jq -r '.data.data | to_entries[] | "export \(.key)=\(.value)"')
|
||||||
|
|
||||||
@echo "Environment retrieved for $@"
|
@echo "Environment retrieved for $@"
|
||||||
|
env | grep -i CONSUL
|
||||||
|
env | grep -i VAULT
|
||||||
|
|
||||||
# Check if on master branch
|
# Check if on master branch
|
||||||
if [ "$(GIT_BRANCH)" = "master" ]; then \
|
if [ "$(GIT_BRANCH)" = "master" ]; then \
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Check for changes in images/ folder and the builds/ folder
|
# Check for changes in images/ folder and the builds/ folder
|
||||||
git fetch origin master:master
|
|
||||||
if [ "$(git branch --show-current)" = "master" ]; then
|
if [ "$(git branch --show-current)" = "master" ]; then
|
||||||
builds_changes=$(git diff --name-only HEAD^...master | grep -E '^builds/')
|
builds_changes=$(git diff --name-only HEAD^...master | grep -E '^builds/')
|
||||||
images_changes=$(git diff --name-only HEAD^...master | grep -E '^images/')
|
images_changes=$(git diff --name-only HEAD^...master | grep -E '^images/')
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user