merge: PR #194 from chore/193-better-cd-versionning-staging

astrodevs-labs · Oct 27, 2023 · 8c757e6 · 8c757e6
2 parents 63fab8e + 1eb1b22
commit 8c757e6
Show file tree

Hide file tree

Showing 12 changed files with 2,726 additions and 16 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -32,7 +32,7 @@ jobs:
     needs: setup
     strategy:
       matrix:
-        workspace: ${{ fromJson(needs.setup.outputs.extensions)}}
+        workspace: ${{ fromJson(needs.setup.outputs.libraries)}}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -69,7 +69,7 @@ jobs:
       - publish-libraries
     strategy:
       matrix:
-        workspace: ${{ fromJson(needs.setup.outputs.libraries)}}
+        workspace: ${{ fromJson(needs.setup.outputs.extensions)}}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -100,11 +100,21 @@ jobs:
             echo "is-unstable=false" >> $GITHUB_OUTPUT
           fi
 
+      - name: Get tag prefix
+        id: get-tag-prefix
+        uses: actions/github-script@v6
+        with:
+          result-encoding: string
+          script: |
+            const workspace = "${{ matrix.workspace.name }}";
+            const language = workspace.split('-')[1];
+            return language;
+
       - uses: paulhatch/semantic-version@d43966692519e4a5d4423b3da1b4b903c58c8f6b
         id: find-new-version
         with:
           # The prefix to use to identify tags
-          tag_prefix: ""
+          tag_prefix: "${{ steps.get-tag-prefix.outputs.result }}-"
           # A string which, if present in a git commit, indicates that a change represents a
           # major (breaking) change, supports regular expressions wrapped with '/'
           major_pattern: "!:"

diff --git a/libs/ast-extractor/Cargo.toml b/libs/ast-extractor/Cargo.toml
@@ -3,7 +3,7 @@ name = "osmium-libs-solidity-ast-extractor"
 description = "Extracts the AST from a Solidity file"
 license = "GPL-3.0-or-later"
 repository = "https://github.com/astrodevs-labs/osmium"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/libs/ast-extractor/LICENSE.txt b/libs/ast-extractor/LICENSE.txt
diff --git a/libs/lsp-handler/Cargo.toml b/libs/lsp-handler/Cargo.toml
@@ -3,7 +3,7 @@ name = "osmium-libs-lsp-handler"
 description = "Dispatch LSP messages to all hooked handlers"
 license = "GPL-3.0-or-later"
 repository = "https://github.com/astrodevs-labs/osmium"
-version = "0.0.1"
+version = "0.0.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/libs/lsp-handler/LICENSE.txt b/libs/lsp-handler/LICENSE.txt
diff --git a/toolchains/solidity/core/Cargo.lock b/toolchains/solidity/core/Cargo.lock
diff --git a/toolchains/solidity/core/crates/extension/Cargo.toml b/toolchains/solidity/core/crates/extension/Cargo.toml
@@ -11,6 +11,6 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 wasm-bindgen = "0.2.87"
-osmium-libs-lsp-handler = { path = "../../../../../libs/lsp-handler", version = "0.0.1" }
+osmium-libs-lsp-handler = { path = "../../../../../libs/lsp-handler", version = "0.0.2" }
 linter-server = { path= "../linter-server"}
 js-sys = "0.3.64"
diff --git a/toolchains/solidity/core/crates/linter-cli/Cargo.toml b/toolchains/solidity/core/crates/linter-cli/Cargo.toml
@@ -2,14 +2,14 @@
 name = "solidhunter"
 description = "Fast solidity linter cli"
 repository = "https://github.com/astrodevs-labs/osmium"
-version = "0.0.2"
+version = "0.0.3"
 edition = "2021"
 license = "GPL-3.0-or-later"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-solidhunter-lib = { path = "../linter-lib", version = "0.0.2" }
+solidhunter-lib = { path = "../linter-lib", version = "0.0.3" }
 clap = { version = "4.0.29", features = ["derive"] }
 colored = "2"
 serde = { version = "1.0.149", features = ["derive"] }