Move source directories into src

a2ikm · Sep 27, 2024 · fe4a30f · fe4a30f
1 parent fd7e14e
commit fe4a30f
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,22 +4,12 @@ on:
   pull_request:
     paths:
       - .github/workflows/ci.yaml
-      - 4.0/**
-      - 4.2/**
-      - 4.4/**
-      - 5.0/**
-      - 6.0/**
-      - 7.0/**
+      - src/**
       - test/**
   push:
     paths:
       - .github/workflows/ci.yaml
-      - 4.0/**
-      - 4.2/**
-      - 4.4/**
-      - 5.0/**
-      - 6.0/**
-      - 7.0/**
+      - src/**
       - test/**
     branches:
       - main
@@ -42,7 +32,7 @@ jobs:
         id: versions
         run: |
           require "json"
-          versions = Dir["*"].grep(/^\d+\.\d+$/)
+          versions = Dir["src/*"].map { |path| File.basename(path) }
           puts "::set-output name=value::#{versions.to_json}"
         shell: ruby {0}
 
@@ -61,7 +51,7 @@ jobs:
       - uses: docker/setup-buildx-action@v2
       - uses: docker/build-push-action@v3
         with:
-          context: ./${{ matrix.version }}
+          context: ./src/${{ matrix.version }}
           load: true
           tags: |
             a2ikm/sharded-mongo:${{ matrix.version }}-test
@@ -116,7 +106,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - uses: docker/build-push-action@v3
         with:
-          context: ./${{ matrix.version }}
+          context: ./src/${{ matrix.version }}
           push: true
           tags: ${{ steps.tags.outputs.value }}
           build-args: |

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ MONGO_VERSION ?= 7.0
 
 .PHONY: test
 test:
-	docker build ./$(MONGO_VERSION) \
+	docker build ./src/$(MONGO_VERSION) \
 		--tag a2ikm/sharded-mongo:$(MONGO_VERSION)-test
 	docker run \
 		--rm \

diff --git a/4.0/Dockerfile → src/4.0/Dockerfile b/4.0/Dockerfile → src/4.0/Dockerfile
diff --git a/4.0/docker-entrypoint.sh → src/4.0/docker-entrypoint.sh b/4.0/docker-entrypoint.sh → src/4.0/docker-entrypoint.sh
diff --git a/4.2/Dockerfile → src/4.2/Dockerfile b/4.2/Dockerfile → src/4.2/Dockerfile
diff --git a/4.2/docker-entrypoint.sh → src/4.2/docker-entrypoint.sh b/4.2/docker-entrypoint.sh → src/4.2/docker-entrypoint.sh
diff --git a/4.4/Dockerfile → src/4.4/Dockerfile b/4.4/Dockerfile → src/4.4/Dockerfile
diff --git a/4.4/docker-entrypoint.sh → src/4.4/docker-entrypoint.sh b/4.4/docker-entrypoint.sh → src/4.4/docker-entrypoint.sh
diff --git a/5.0/Dockerfile → src/5.0/Dockerfile b/5.0/Dockerfile → src/5.0/Dockerfile
diff --git a/5.0/docker-entrypoint.sh → src/5.0/docker-entrypoint.sh b/5.0/docker-entrypoint.sh → src/5.0/docker-entrypoint.sh
diff --git a/6.0/Dockerfile → src/6.0/Dockerfile b/6.0/Dockerfile → src/6.0/Dockerfile
diff --git a/6.0/docker-entrypoint.sh → src/6.0/docker-entrypoint.sh b/6.0/docker-entrypoint.sh → src/6.0/docker-entrypoint.sh
diff --git a/7.0/Dockerfile → src/7.0/Dockerfile b/7.0/Dockerfile → src/7.0/Dockerfile
diff --git a/7.0/docker-entrypoint.sh → src/7.0/docker-entrypoint.sh b/7.0/docker-entrypoint.sh → src/7.0/docker-entrypoint.sh