bump version 3 4 1 (#4)

* [FIX] workflow conan fix (#3) * bump version 3.4.1
edwardstock · Mar 23, 2024 · 6267ab1 · 6267ab1
1 parent 6cab60c
commit 6267ab1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/.github/actions/setup-conan/action.yml b/.github/actions/setup-conan/action.yml
@@ -6,6 +6,14 @@ inputs:
     required: true
     description: "Artifactory API key"
 
+  artifactory_repo:
+    required: true
+    description: "Artifactory repository api url"
+
+  artifactory_user:
+    required: true
+    description: "Artifactory user"
+
 runs:
   using: composite
   steps:
@@ -15,5 +23,5 @@ runs:
         pip install --upgrade pip
         pip install conan
         conan profile detect --force
-        conan remote add edwardstock https://conan.edwardstock.com/artifactory/api/conan/conan-local
-        conan remote login -p ${{ inputs.artifactory_api_key }} edwardstock admin
+        conan remote add edwardstock ${{ inputs.artifactory_repo }}
+        conan remote login -p ${{ inputs.artifactory_api_key }} edwardstock ${{ inputs.artifactory_user }}
diff --git a/.github/workflows/build_conan.yml b/.github/workflows/build_conan.yml
@@ -29,6 +29,8 @@ jobs:
         uses: ./.github/actions/setup-conan
         with:
           artifactory_api_key: ${{ secrets.ARTIFACTORY_API_KEY }}
+          artifactory_repo: ${{ vars.ARTIFACTORY_REPO_URL }}
+          artifactory_user: ${{ secrets.ARTIFACTORY_API_USER }}
 
       - name: Run Tests
         uses: ./.github/actions/run-tests

diff --git a/.github/workflows/check_pr.yml b/.github/workflows/check_pr.yml
@@ -24,6 +24,8 @@ jobs:
         uses: ./.github/actions/setup-conan
         with:
           artifactory_api_key: ${{ secrets.ARTIFACTORY_API_KEY }}
+          artifactory_repo: ${{ vars.ARTIFACTORY_REPO_URL }}
+          artifactory_user: ${{ secrets.ARTIFACTORY_API_USER }}
 
       - name: Run Tests
         uses: ./.github/actions/run-tests
@@ -47,6 +49,8 @@ jobs:
         uses: ./.github/actions/setup-conan
         with:
           artifactory_api_key: ${{ secrets.ARTIFACTORY_API_KEY }}
+          artifactory_repo: ${{ vars.ARTIFACTORY_REPO_URL }}
+          artifactory_user: ${{ secrets.ARTIFACTORY_API_USER }}
 
       - name: Run Tests
         uses: ./.github/actions/run-tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.19)
 project(toolbox
-        VERSION 3.4.0
+        VERSION 3.4.1
         LANGUAGES CXX
         DESCRIPTION "Toolbox - C++ helpers, especially for string and bytes handling"
 )

diff --git a/version.info b/version.info
@@ -1 +1 @@
-3.4.0
+3.4.1