Merge pull request #20 from kruserr/2024-02-23

2024 02 23
kruserr · Feb 23, 2024 · a4d4712 · a4d4712
2 parents 8c42af6 + 5643b8d
commit a4d4712
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   IMAGE_NAME: rapiddb
-  IMAGE_LATEST: docker.pkg.github.com/kruserr/rapiddb/rapiddb:latest
+  IMAGE_CACHE: docker.pkg.github.com/kruserr/rapiddb/rapiddb:cache
 
 jobs:
   rustfmt:
@@ -98,7 +98,8 @@ jobs:
       - name: Build image
         run: |
           docker build \
-            --cache-from $IMAGE_LATEST \
+            -f tooling/Dockerfile
+            --cache-from $IMAGE_CACHE \
             --build-arg BUILDKIT_INLINE_CACHE=1 \
             --tag $IMAGE_NAME .
       - name: Login to GitHub Packages
@@ -130,6 +131,9 @@ jobs:
 
           docker tag $IMAGE_NAME $IMAGE_ID:$VERSION_MAJOR
           docker push $IMAGE_ID:$VERSION_MAJOR
+
+          docker tag $IMAGE_NAME $IMAGE_ID:latest
+          docker push $IMAGE_ID:latest
       - name: Login to Docker Hub
         run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login docker.io -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
       - name: Push image to Docker Hub
@@ -159,3 +163,6 @@ jobs:
 
           docker tag $IMAGE_NAME $IMAGE_ID:$VERSION_MAJOR
           docker push $IMAGE_ID:$VERSION_MAJOR
+
+          docker tag $IMAGE_NAME $IMAGE_ID:latest
+          docker push $IMAGE_ID:latest
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   IMAGE_NAME: rapiddb
-  IMAGE_LATEST: docker.pkg.github.com/kruserr/rapiddb/rapiddb:latest
+  IMAGE_CACHE: docker.pkg.github.com/kruserr/rapiddb/rapiddb:cache
 
 jobs:
   rustfmt:
@@ -57,7 +57,8 @@ jobs:
       - name: Build image
         run: |
           docker build \
-            --cache-from $IMAGE_LATEST \
+            -f tooling/Dockerfile
+            --cache-from $IMAGE_CACHE \
             --build-arg BUILDKIT_INLINE_CACHE=1 \
             --tag $IMAGE_NAME .
       - name: Login to GitHub Packages
@@ -69,8 +70,7 @@ jobs:
           # Change all uppercase to lowercase
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
 
-          # Use Docker `latest` tag convention
-          VERSION=latest
+          VERSION=cache
 
           docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
           docker push $IMAGE_ID:$VERSION
@@ -83,8 +83,7 @@ jobs:
           # Change all uppercase to lowercase
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
 
-          # Use Docker `latest` tag convention
-          VERSION=latest
+          VERSION=cache
 
           docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
           docker push $IMAGE_ID:$VERSION
diff --git a/.dangerously-publish.sh → tooling/.dangerously-publish.sh b/.dangerously-publish.sh → tooling/.dangerously-publish.sh
diff --git a/Dockerfile → tooling/Dockerfile b/Dockerfile → tooling/Dockerfile
diff --git a/Dockerfile-mmav → tooling/Dockerfile-mmav b/Dockerfile-mmav → tooling/Dockerfile-mmav
diff --git a/bench.sh → tooling/bench.sh b/bench.sh → tooling/bench.sh
diff --git a/build-bench.sh → tooling/build-bench.sh b/build-bench.sh → tooling/build-bench.sh
diff --git a/ci.sh → tooling/ci.sh b/ci.sh → tooling/ci.sh
diff --git a/cliff.toml → tooling/cliff.toml b/cliff.toml → tooling/cliff.toml
diff --git a/git-cliff-detailed.toml → tooling/git-cliff-detailed.toml b/git-cliff-detailed.toml → tooling/git-cliff-detailed.toml
diff --git a/prepare_release.sh → tooling/prepare_release.sh b/prepare_release.sh → tooling/prepare_release.sh
@@ -32,7 +32,7 @@ prepare_tag () {
     - {% if commit.breaking %}(breaking) {% endif %}{{ commit.message | upper_first }} ({{ commit.id | truncate(length=7, end=\"\") }})\
   {% endfor %}
   {% endfor %}"
-  changelog=$(git-cliff --config git-cliff-detailed.toml --unreleased --strip all)
+  changelog=$(git-cliff --config tooling/git-cliff-detailed.toml --unreleased --strip all)
 
   git add -A && git commit -m "chore(release): prepare for $1"
 
@@ -49,7 +49,7 @@ if [ -n $1 ]; then
 
       bump_version $2
 
-      git-cliff --tag "$2" > CHANGELOG.md
+      git-cliff --config tooling/cliff.toml --tag "$2" > CHANGELOG.md
 
       prepare_tag $2
     else
@@ -60,7 +60,7 @@ if [ -n $1 ]; then
 
     bump_version $1
 
-    git-cliff --unreleased --tag "$1" --prepend CHANGELOG.md
+    git-cliff --config tooling/cliff.toml --unreleased --tag "$1" --prepend CHANGELOG.md
 
     prepare_tag $1
   fi

diff --git a/wrk.lua → tooling/wrk.lua b/wrk.lua → tooling/wrk.lua