Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(sed): small syntax fix to the sed syntax because regex is hard #40

Merged
merged 5 commits into from
Sep 20, 2023
Merged

fix(sed): small syntax fix to the sed syntax because regex is hard #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
296b6e2
fix(sed): small syntax fix to the sed syntax because regex is hard
obs-gh-colinhutchinson Sep 20, 2023
3ce288f
fix(registry): adjust to fix how we infer the container registry
obs-gh-colinhutchinson Sep 20, 2023
9d5e4c5
Make syntax fix
obs-gh-colinhutchinson Sep 20, 2023
3eff62b
fix(ci): add fetch depth to checkout action
obs-gh-colinhutchinson Sep 20, 2023
88697e7
fix(Make): let's just simplify
obs-gh-colinhutchinson Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ jobs:
with:
repository: ${{ github.repository_owner }}/${{ env.AWS_TEST_KITCHEN_REPO }}
submodules: true
fetch-depth: 0

- name: Checkout Terraform SHA
if: matrix.provider == 'terraform' && inputs.code_sha != ''
Expand Down
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ PROVIDER ?= cloudformation

DOCKER_CMD := $(shell docker buildx version >/dev/null 2>&1 && echo "buildx" || echo "build")

GIT_REMOTE := $(shell git remote get-url origin | sed -e 's/.*[\/:]\([^/]*\/[^/]*\)\.git/\1/')
GIT_REPO ?= "aws-test-kitchen"
GIT_ORG ?= "observeinc"

DOCKER_REGISTRY ?= ghcr.io
IMAGE_REPO ?= $(DOCKER_REGISTRY)/$(GIT_REMOTE)
IMAGE_REPO = $(DOCKER_REGISTRY)/$(GIT_ORG)/$(GIT_REPO)
GIT_SHA := $(shell git rev-parse --short HEAD)
IMAGE_TAG ?= $(GIT_SHA)
IMAGE_NAME ?= $(IMAGE_REPO):$(IMAGE_TAG)
Expand Down Expand Up @@ -34,6 +36,7 @@ docker/clean: docker/test/clean
.PHONY: docker/build
docker/build:
git fetch --all
git fetch origin main:main
@if git diff --quiet HEAD main -- Gemfile Gemfile.lock Dockerfile; then \
echo "No changes detected in Gemfile, Gemfile.lock, or Dockerfile compared to main. Pulling latest image from main branch."; \
echo "Debug: IMAGE_REPO = $(IMAGE_REPO)"; \
Expand All @@ -60,8 +63,6 @@ docker/build:
fi; \
fi



.PHONY: docker/%
docker/%:
$(MAKE) docker/run DOCKER_COMMAND="make $*"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/base/verify/collection_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

# Get all Firehose delivery streams
firehose = Aws::Firehose::Client.new
firehose_found = true
firehose_found = false
firehose.list_delivery_streams.delivery_stream_names.each do |stream|
# Filter out the ones that match your prefix
if stream.start_with?("#{provider}-#{user}")
Expand Down