Move to semver (#391)

Author: levkk

.github/workflows/package.yml

@@ -2,6 +2,8 @@ name: package
 on:
   push:
     branches: ['main']
+  release:
+    types: [published]
   workflow_dispatch:
 
 env:
@@ -90,6 +92,9 @@ jobs:
       attestations: write
       id-token: write
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Download digests
         uses: actions/download-artifact@v4
         with:
@@ -107,6 +112,17 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Check for git tag
+        id: tag
+        run: |
+          TAG=$(git describe --exact-match --tags HEAD 2>/dev/null || echo "")
+          echo "tag=$TAG" >> $GITHUB_OUTPUT
+          if [ -n "$TAG" ]; then
+            echo "Git tag found: $TAG"
+          else
+            echo "No git tag found for current commit"
+          fi
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
@@ -118,6 +134,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=sha,prefix={{branch}}-,format=short
+            ${{ steps.tag.outputs.tag && format('type=raw,value={0}', steps.tag.outputs.tag) || '' }}
 
       - name: Create manifest list and push
         working-directory: ${{ runner.temp }}/digests

.gitignore

@@ -48,3 +48,4 @@ perf.data.old
 
 # Ignore generated bindings
 pgdog-plugin/src/bindings.rs
+local/

pgdog/src/admin/show_version.rs

@@ -1,3 +1,5 @@
+use crate::util::pgdog_version;
+
 use super::{
     prelude::{DataRow, Field, Protocol, RowDescription},
     *,
@@ -16,10 +18,8 @@ impl Command for ShowVersion {
     }
 
     async fn execute(&self) -> Result<Vec<Message>, Error> {
-        let version = env!("GIT_HASH");
-
         let mut dr = DataRow::new();
-        dr.add(format!("PgDog v{}", version));
+        dr.add(format!("PgDog {}", pgdog_version()));
 
         Ok(vec![
             RowDescription::new(&[Field::text("version")]).message()?,

pgdog/src/main.rs

@@ -9,10 +9,10 @@ use pgdog::frontend::listener::Listener;
 use pgdog::net;
 use pgdog::plugin;
 use pgdog::stats;
+use pgdog::util::pgdog_version;
 use tokio::runtime::Builder;
 use tracing::info;
 
-use std::ops::Deref;
 use std::process::exit;
 
 #[cfg(not(target_env = "msvc"))]
@@ -60,11 +60,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         _ => (),
     }
 
-    info!(
-        "🐕 PgDog v{} ({})",
-        env!("GIT_HASH"),
-        pgdog_plugin::comp::rustc_version().deref()
-    );
+    info!("🐕 PgDog {}", pgdog_version());
     let config = config::load(&args.config, &args.users)?;
 
     // Get databases from environment or from --database-url args.

pgdog/src/util.rs

@@ -1,6 +1,7 @@
 //! What's a project without a util module.
 
 use chrono::{DateTime, Local, Utc};
+use pgdog_plugin::comp;
 use rand::{distributions::Alphanumeric, Rng};
 use std::time::Duration; // 0.8
 
@@ -75,6 +76,16 @@ pub fn escape_identifier(s: &str) -> String {
     s.replace("\"", "\"\"")
 }
 
+/// Get PgDog's version string.
+pub fn pgdog_version() -> String {
+    format!(
+        "v{} [main@{}, {}]",
+        env!("CARGO_PKG_VERSION"),
+        env!("GIT_HASH"),
+        comp::rustc_version().to_string()
+    )
+}
+
 #[cfg(test)]
 mod test {