From 53394c628765f551f99fe209d4fb777a450d5130 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Thu, 26 Aug 2021 22:22:56 +0000 Subject: [PATCH 1/3] fix(docs): update repo name in mkdocs config --- mkdocs.repo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.repo.yml b/mkdocs.repo.yml index d19b90d7..78620d2f 100644 --- a/mkdocs.repo.yml +++ b/mkdocs.repo.yml @@ -2,5 +2,5 @@ repo_url: https://github.com/CodeForPhilly/codeforphilly extra: repository: - name: laddr + name: codeforphilly url: git@github.com:CodeForPhilly/codeforphilly.git From 7197d073b7acdc07f46ee3c9721f4ada12eb9718 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sat, 28 Aug 2021 00:14:26 +0000 Subject: [PATCH 2/3] feat(ci): auto publishing docker release versions --- .github/workflows/release-deploy.yml | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/.github/workflows/release-deploy.yml b/.github/workflows/release-deploy.yml index c4d98477..4b103433 100644 --- a/.github/workflows/release-deploy.yml +++ b/.github/workflows/release-deploy.yml @@ -5,6 +5,12 @@ on: branches: [ 'releases/v*' ] types: [ closed ] +env: + DOCKER_REGISTRY: ghcr.io + DOCKER_PACKAGE: site-composite + + HAB_LICENSE: accept-no-persist + jobs: release-deploy: @@ -32,6 +38,47 @@ jobs: echo "${PR_BODY}" >> $GITHUB_ENV echo 'END_OF_PR_BODY' >> $GITHUB_ENV + DOCKER_REPOSITORY="${GITHUB_REPOSITORY,,}" + echo "Using DOCKER_REPOSITORY=${DOCKER_REPOSITORY}" + echo "DOCKER_REPOSITORY=${DOCKER_REPOSITORY}" >> $GITHUB_ENV + + DOCKER_TAG="${RELEASE_TAG:1}" + echo "Using DOCKER_TAG=${DOCKER_TAG}" + echo "DOCKER_TAG=${DOCKER_TAG}" >> $GITHUB_ENV + + - name: 'Initialize Chef Habitat environment' + uses: JarvusInnovations/habitat-action@action/v1 + with: + deps: | + jarvus/hologit + + - uses: actions/checkout@v2 + + - id: site-projection + name: 'Project holobranch: emergence-site' + uses: JarvusInnovations/hologit@actions/projector/v1 + with: + # use HEAD checked out above by checkout action + ref: HEAD + fetch: false + holobranch: emergence-site + + - name: Build & push Docker image + uses: whoan/docker-build-with-cache-action@v5 + with: + dockerfile: Dockerfile + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + registry: ${{ env.DOCKER_REGISTRY }} + image_name: ${{ env.DOCKER_REPOSITORY }}/${{ env.DOCKER_PACKAGE }} + image_tag: ${{ env.DOCKER_TAG }} + build_extra_args: | + --build-arg=SITE_TREE=${{ steps.site-projection.outputs.tree }} + --build-arg=SITE_VERSION=${{ env.RELEASE_TAG }} + --build-arg=SOURCE_COMMIT=${{ github.sha }} + --build-arg=SOURCE_TAG=${{ env.RELEASE_TAG }} + --build-arg=HAB_LICENSE=${{ env.HAB_LICENSE }} + - name: Create release uses: ncipollo/release-action@v1 with: From 7c7e823e0b8c8c49da4d5bc53d7db010d5ba9bee Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sat, 28 Aug 2021 00:18:45 +0000 Subject: [PATCH 3/3] chore(deps): bump laddr to v3.0.7 --- .holo/sources/laddr.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.holo/sources/laddr.toml b/.holo/sources/laddr.toml index da1e17d9..1bf03115 100644 --- a/.holo/sources/laddr.toml +++ b/.holo/sources/laddr.toml @@ -1,3 +1,3 @@ [holosource] url = "https://github.com/CodeForPhilly/laddr" -ref = "refs/tags/v3.0.5" +ref = "refs/tags/v3.0.7"