Skip to content

Commit

Permalink
BBL-381 | testing centralized makefile approach
Browse files Browse the repository at this point in the history
  • Loading branch information
exequielrafaela committed Sep 11, 2020
1 parent cc1aae8 commit 530f1d2
Show file tree
Hide file tree
Showing 5 changed files with 106 additions and 199 deletions.
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ jobs:
echo "==============================================================================================="
git config --global user.email "$GIT_USER_EMAIL"
git config --global user.name "$GIT_USER_NAME"
make -f Makefile.release release-$VERSION_NUMBER-with-changelog-circleci
make init-makefiles
echo "Makefile" >> ./.gitignore
make release-$VERSION_NUMBER-with-changelog-circleci
else
echo "==============================================================================================="
echo "Changes in working directory pending to be pushed - please check 'git status' cmd output below "
Expand Down
88 changes: 87 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,89 @@
# Hidden files #
################
.*
#
# Except
#
!*.env.example
!*.circleci
!*.dockeringnore
!*.hosts
!.hosts.example
!*.gitignore
!/.chglog
!/.gitallowed
!/.github
!*.gitkeep
!*.editorconfig

# SSH keys #
############
id_rsa
id_dsa
keys/

# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db

# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.tar.gz

#
# Except
#
!lambda_function.*.zip
!lambda_function.lambda_handler.zip
!lambda_function.*.zip

# Logs and databases #
######################
*.log
*.sql
*.sqlite
*.out

# IDE related files #
#####################
.classpath
.project
.settings
.idea
.metadata
*.iml
*.ipr
.vscode
/src
/venv

# Custom Project tools files #
########################
*.pyc
*.pyo
*.vault_pass
*.pgpass
*.vagrant

# Project specific files #
#################################
/@bin
site/
ab-results-*
.idea/

12 changes: 0 additions & 12 deletions @bin/makefiles/circleci/Makefile.circleci

This file was deleted.

26 changes: 16 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
.PHONY: help
SHELL := /bin/bash
MAKEFILE_IMPORT_CIRCLECI := ./@bin/makefiles/circleci/Makefile.circleci
MAKEFILE_PATH := ./Makefile
MAKEFILES_DIR := ./@bin/makefiles

LOCAL_OS_USER_ID := $(shell id -u)
LOCAL_OS_GROUP_ID := $(shell id -g)
MKDOCS_DOCKER_IMG := squidfunk/mkdocs-material:5.5.6

define MAKE_CIRCLECI
make \
-f ${MAKEFILE_IMPORT_CIRCLECI}
endef
MKDOCS_DOCKER_IMG := squidfunk/mkdocs-material:5.5.12

help:
@echo 'Available Commands:'
Expand Down Expand Up @@ -43,7 +39,17 @@ docs-check-dead-links: ## Check if the documentation contains dead links.
rm -rf ab-results-*

#==============================================================#
# CIRCLECI #
# INITIALIZATION #
#==============================================================#
circleci-validate-config: ## Validate A CircleCI Config (https://circleci.com/docs/2.0/local-cli/)
${MAKE_CIRCLECI} circleci-validate-config
init-makefiles: ## initialize makefiles
rm -rf ${MAKEFILES_DIR}
mkdir -p ${MAKEFILES_DIR}
git clone https://github.com/binbashar/le-dev-makefiles.git ${MAKEFILES_DIR}
echo "" >> ${MAKEFILE_PATH}
sed -i '/^#include.*/s/^#//' ${MAKEFILE_PATH}

#
## IMPORTANT: Automatically managed -> don't uncomment this line
#
include ./@bin/makefiles/circleci/circleci.mk
include ./@bin/makefiles/release-mgmt/release.mk
175 changes: 0 additions & 175 deletions Makefile.release

This file was deleted.

0 comments on commit 530f1d2

Please sign in to comment.