From f4bc4a7673c24f2d42e08ac8549d740d738308c6 Mon Sep 17 00:00:00 2001 From: Hinton Date: Fri, 12 Jan 2024 12:25:50 +0100 Subject: [PATCH 1/5] Remove references to `unix-x64` with `linux-x64`. --- .github/workflows/build-dotnet.yml | 2 +- .github/workflows/publish-dotnet.yml | 2 +- .github/workflows/publish-php.yml | 6 +++--- .github/workflows/publish-ruby.yml | 6 +++--- languages/csharp/Bitwarden.Sdk/Bitwarden.Sdk.csproj | 2 +- languages/php/src/BitwardenLib.php | 2 +- languages/ruby/bitwarden_sdk/bitwarden-sdk.gemspec | 2 +- languages/ruby/bitwarden_sdk/lib/bitwarden_lib.rb | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-dotnet.yml b/.github/workflows/build-dotnet.yml index 904cea204..ab1c4b8aa 100644 --- a/.github/workflows/build-dotnet.yml +++ b/.github/workflows/build-dotnet.yml @@ -50,7 +50,7 @@ jobs: uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 with: name: libbitwarden_c_files-x86_64-unknown-linux-gnu - path: languages/csharp/Bitwarden.Sdk/ubuntu-x64 + path: languages/csharp/Bitwarden.Sdk/linux-x64 - name: Download x86_64-pc-windows-msvc files uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 diff --git a/.github/workflows/publish-dotnet.yml b/.github/workflows/publish-dotnet.yml index a7a6a6e0e..6f5d691d8 100644 --- a/.github/workflows/publish-dotnet.yml +++ b/.github/workflows/publish-dotnet.yml @@ -52,7 +52,7 @@ jobs: uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 with: name: libbitwarden_c_files-x86_64-unknown-linux-gnu - path: languages/csharp/Bitwarden.Sdk/ubuntu-x64 + path: languages/csharp/Bitwarden.Sdk/linux-x64 - name: Download x86_64-pc-windows-msvc files uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 diff --git a/.github/workflows/publish-php.yml b/.github/workflows/publish-php.yml index 6ed52537a..419ea234d 100644 --- a/.github/workflows/publish-php.yml +++ b/.github/workflows/publish-php.yml @@ -48,7 +48,7 @@ jobs: uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 with: name: libbitwarden_c_files-x86_64-unknown-linux-gnu - path: temp/ubuntu-x64 + path: temp/linux-x64 - name: Download x86_64-pc-windows-msvc files uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 @@ -59,11 +59,11 @@ jobs: - name: Copy lib files run: | mkdir -p languages/php/src/lib/macos-arm64 - mkdir -p languages/php/src/lib/ubuntu-x64 + mkdir -p languages/php/src/lib/linux-x64 mkdir -p languages/php/src/lib/macos-x64 mkdir -p languages/php/src/lib/windows-x64 - platforms=("macos-arm64" "ubuntu-x64" "macos-x64" "windows-x64") + platforms=("macos-arm64" "linux-x64" "macos-x64" "windows-x64") files=("libbitwarden_c.dylib" "libbitwarden_c.so" "libbitwarden_c.dylib" "bitwarden_c.dll") for ((i=0; i<${#platforms[@]}; i++)); do diff --git a/.github/workflows/publish-ruby.yml b/.github/workflows/publish-ruby.yml index 4315dea66..2a5c167f9 100644 --- a/.github/workflows/publish-ruby.yml +++ b/.github/workflows/publish-ruby.yml @@ -49,7 +49,7 @@ jobs: uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 with: name: libbitwarden_c_files-x86_64-unknown-linux-gnu - path: temp/ubuntu-x64 + path: temp/linux-x64 - name: Download x86_64-pc-windows-msvc files uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 @@ -60,11 +60,11 @@ jobs: - name: Copy lib files run: | mkdir -p languages/ruby/bitwarden_sdk/lib/macos-arm64 - mkdir -p languages/ruby/bitwarden_sdk/lib/ubuntu-x64 + mkdir -p languages/ruby/bitwarden_sdk/lib/linux-x64 mkdir -p languages/ruby/bitwarden_sdk/lib/macos-x64 mkdir -p languages/ruby/bitwarden_sdk/lib/windows-x64 - platforms=("macos-arm64" "ubuntu-x64" "macos-x64" "windows-x64") + platforms=("macos-arm64" "linux-x64" "macos-x64" "windows-x64") files=("libbitwarden_c.dylib" "libbitwarden_c.so" "libbitwarden_c.dylib" "bitwarden_c.dll") for ((i=0; i<${#platforms[@]}; i++)); do diff --git a/languages/csharp/Bitwarden.Sdk/Bitwarden.Sdk.csproj b/languages/csharp/Bitwarden.Sdk/Bitwarden.Sdk.csproj index 183ea8db9..3717aefdf 100644 --- a/languages/csharp/Bitwarden.Sdk/Bitwarden.Sdk.csproj +++ b/languages/csharp/Bitwarden.Sdk/Bitwarden.Sdk.csproj @@ -62,7 +62,7 @@ true runtimes/osx-arm64/native - + Always true runtimes/linux-x64/native diff --git a/languages/php/src/BitwardenLib.php b/languages/php/src/BitwardenLib.php index 3eb3ed5f4..351728986 100644 --- a/languages/php/src/BitwardenLib.php +++ b/languages/php/src/BitwardenLib.php @@ -27,7 +27,7 @@ public function __construct() $lib_file = __DIR__.'/../../../target/debug/bitwarden_c.dll'; } } elseif (PHP_OS === 'Linux') { - $lib_file = '/lib/ubuntu-x64/libbitwarden_c.so'; + $lib_file = '/lib/linux-x64/libbitwarden_c.so'; if (file_exists($lib_file) == false) { $lib_file = __DIR__.'/../../../target/debug/libbitwarden_c.so'; } diff --git a/languages/ruby/bitwarden_sdk/bitwarden-sdk.gemspec b/languages/ruby/bitwarden_sdk/bitwarden-sdk.gemspec index 596531035..d11a57f38 100644 --- a/languages/ruby/bitwarden_sdk/bitwarden-sdk.gemspec +++ b/languages/ruby/bitwarden_sdk/bitwarden-sdk.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| end end - spec.files += Dir.glob('lib/ubuntu-x64/**/*') + spec.files += Dir.glob('lib/linux-x64/**/*') spec.files += Dir.glob('lib/macos-x64/**/*') spec.files += Dir.glob('lib/windows-x64/**/*') spec.files += Dir.glob('lib/macos-arm64/**/*') diff --git a/languages/ruby/bitwarden_sdk/lib/bitwarden_lib.rb b/languages/ruby/bitwarden_sdk/lib/bitwarden_lib.rb index e09541788..8217d87b0 100644 --- a/languages/ruby/bitwarden_sdk/lib/bitwarden_lib.rb +++ b/languages/ruby/bitwarden_sdk/lib/bitwarden_lib.rb @@ -19,7 +19,7 @@ def self.mac_with_intel? end File.exist?(local_file) ? local_file : File.expand_path('../../../../target/debug/libbitwarden_c.dylib', __dir__) when /linux/ - local_file = File.expand_path('ubuntu-x64/libbitwarden_c.so', __dir__) + local_file = File.expand_path('linux-x64/libbitwarden_c.so', __dir__) File.exist?(local_file) ? local_file : File.expand_path('../../../../target/debug/libbitwarden_c.so', __dir__) when /mswin|mingw/ local_file = File.expand_path('windows-x64/bitwarden_c.dll', __dir__) From 4fa8b714b73e739b48272738f2c0d6a0b6182eb3 Mon Sep 17 00:00:00 2001 From: Hinton Date: Fri, 12 Jan 2024 12:29:20 +0100 Subject: [PATCH 2/5] Fix java arches --- .github/workflows/build-java.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml index d2bc049d1..a1a53e529 100644 --- a/.github/workflows/build-java.yml +++ b/.github/workflows/build-java.yml @@ -39,7 +39,7 @@ jobs: uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 with: name: libbitwarden_c_files-x86_64-apple-darwin - path: languages/java/src/main/resources/darwin-x64 + path: languages/java/src/main/resources/darwin-x86-64 - name: Download aarch64-apple-darwin files uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 @@ -51,13 +51,13 @@ jobs: uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 with: name: libbitwarden_c_files-x86_64-unknown-linux-gnu - path: languages/java/src/main/resources/ubuntu-x64 + path: languages/java/src/main/resources/linux-x86-64 - name: Download x86_64-pc-windows-msvc files uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 with: name: libbitwarden_c_files-x86_64-pc-windows-msvc - path: languages/java/src/main/resources/windows-x64 + path: languages/java/src/main/resources/win32-x86-64 - name: Publish Maven uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1 From 38bc37e2487c900295ab0688f7ed086221cad166 Mon Sep 17 00:00:00 2001 From: Hinton Date: Fri, 12 Jan 2024 14:57:10 +0100 Subject: [PATCH 3/5] Allow workflow dispatch for java --- .github/workflows/build-java.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml index a1a53e529..5b7fb3be0 100644 --- a/.github/workflows/build-java.yml +++ b/.github/workflows/build-java.yml @@ -4,6 +4,7 @@ on: push: branches: - main + workflow_dispatch: jobs: generate_schemas: From 29c762f8aa0aa48b01e3db24a4dbefbf9978030a Mon Sep 17 00:00:00 2001 From: Hinton Date: Fri, 12 Jan 2024 14:58:59 +0100 Subject: [PATCH 4/5] Trigger a CI build --- .github/workflows/build-java.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml index 5b7fb3be0..5a54fac96 100644 --- a/.github/workflows/build-java.yml +++ b/.github/workflows/build-java.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - ps/fix-arch workflow_dispatch: jobs: From d9a715dee11b2751d6cdb59ab631751cdd7618a2 Mon Sep 17 00:00:00 2001 From: Hinton Date: Fri, 12 Jan 2024 14:59:15 +0100 Subject: [PATCH 5/5] Remove CI trigger --- .github/workflows/build-java.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml index 5a54fac96..5b7fb3be0 100644 --- a/.github/workflows/build-java.yml +++ b/.github/workflows/build-java.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - ps/fix-arch workflow_dispatch: jobs: