From 535a8befe281459ca8f391bbf5f52de48385823f Mon Sep 17 00:00:00 2001 From: Michal Checinski Date: Thu, 22 Feb 2024 13:07:36 +0100 Subject: [PATCH 1/6] Fix Publish Ruby workflow --- .github/workflows/publish-ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-ruby.yml b/.github/workflows/publish-ruby.yml index e22217a21..09261131a 100644 --- a/.github/workflows/publish-ruby.yml +++ b/.github/workflows/publish-ruby.yml @@ -113,4 +113,4 @@ jobs: - name: Push gem to Rubygems if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: rubygems/release-gem@48512b949a6517699b78f000b4f36e641d321ed3 # v1.0.0 + uses: rubygems/release-gem@035c7c1c1c14d277318867ced5037926d2395300 # v1.0.1 From dbc1fed18e23f32ff48a975066d402d62edef239 Mon Sep 17 00:00:00 2001 From: Michal Checinski Date: Thu, 22 Feb 2024 13:11:41 +0100 Subject: [PATCH 2/6] Fix name --- .github/workflows/publish-ruby.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-ruby.yml b/.github/workflows/publish-ruby.yml index 09261131a..bde1f8654 100644 --- a/.github/workflows/publish-ruby.yml +++ b/.github/workflows/publish-ruby.yml @@ -63,7 +63,7 @@ jobs: path: temp/macos-x64 workflow_conclusion: success branch: ${{ github.event.inputs.release_type == 'Dry Run' && 'main' || github.ref_name }} - name: libbitwarden_c_files-x86_64-apple-darwin + artifacts: libbitwarden_c_files-x86_64-apple-darwin - name: Download aarch64-apple-darwin artifact uses: bitwarden/gh-actions/download-artifacts@main @@ -71,7 +71,7 @@ jobs: workflow: generate_schemas.yml workflow_conclusion: success branch: ${{ github.event.inputs.release_type == 'Dry Run' && 'main' || github.ref_name }} - name: libbitwarden_c_files-aarch64-apple-darwin + artifacts: libbitwarden_c_files-aarch64-apple-darwin path: temp/macos-arm64 - name: Download x86_64-unknown-linux-gnu artifact @@ -80,7 +80,7 @@ jobs: workflow: generate_schemas.yml workflow_conclusion: success branch: ${{ github.event.inputs.release_type == 'Dry Run' && 'main' || github.ref_name }} - name: libbitwarden_c_files-x86_64-unknown-linux-gnu + artifacts: libbitwarden_c_files-x86_64-unknown-linux-gnu path: temp/linux-x64 - name: Download x86_64-pc-windows-msvc artifact @@ -89,7 +89,7 @@ jobs: workflow: generate_schemas.yml workflow_conclusion: success branch: ${{ github.event.inputs.release_type == 'Dry Run' && 'main' || github.ref_name }} - name: libbitwarden_c_files-x86_64-pc-windows-msvc + artifacts: libbitwarden_c_files-x86_64-pc-windows-msvc path: temp/windows-x64 - name: Copy lib files From fd1df10a9c824ff4b4da13b3ea3295f2e3e905c5 Mon Sep 17 00:00:00 2001 From: Michal Checinski Date: Thu, 22 Feb 2024 13:14:07 +0100 Subject: [PATCH 3/6] Fix workflow name --- .github/workflows/publish-ruby.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-ruby.yml b/.github/workflows/publish-ruby.yml index bde1f8654..5c56a5255 100644 --- a/.github/workflows/publish-ruby.yml +++ b/.github/workflows/publish-ruby.yml @@ -54,12 +54,12 @@ jobs: path: languages/ruby/bitwarden_sdk_secrets/lib workflow_conclusion: success branch: ${{ github.event.inputs.release_type == 'Dry Run' && 'main' || github.ref_name }} - name: schemas.rb + artifacts: schemas.rb - name: Download x86_64-apple-darwin artifact uses: bitwarden/gh-actions/download-artifacts@main with: - workflow: generate_schemas.yml + workflow: build-rust-cross-platform.yml path: temp/macos-x64 workflow_conclusion: success branch: ${{ github.event.inputs.release_type == 'Dry Run' && 'main' || github.ref_name }} @@ -68,7 +68,7 @@ jobs: - name: Download aarch64-apple-darwin artifact uses: bitwarden/gh-actions/download-artifacts@main with: - workflow: generate_schemas.yml + workflow: build-rust-cross-platform.yml workflow_conclusion: success branch: ${{ github.event.inputs.release_type == 'Dry Run' && 'main' || github.ref_name }} artifacts: libbitwarden_c_files-aarch64-apple-darwin @@ -77,7 +77,7 @@ jobs: - name: Download x86_64-unknown-linux-gnu artifact uses: bitwarden/gh-actions/download-artifacts@main with: - workflow: generate_schemas.yml + workflow: build-rust-cross-platform.yml workflow_conclusion: success branch: ${{ github.event.inputs.release_type == 'Dry Run' && 'main' || github.ref_name }} artifacts: libbitwarden_c_files-x86_64-unknown-linux-gnu @@ -86,7 +86,7 @@ jobs: - name: Download x86_64-pc-windows-msvc artifact uses: bitwarden/gh-actions/download-artifacts@main with: - workflow: generate_schemas.yml + workflow: build-rust-cross-platform.yml workflow_conclusion: success branch: ${{ github.event.inputs.release_type == 'Dry Run' && 'main' || github.ref_name }} artifacts: libbitwarden_c_files-x86_64-pc-windows-msvc From 15fc48b6fd0641eb9603eefc714da12c5f9c8176 Mon Sep 17 00:00:00 2001 From: Michal Checinski Date: Thu, 22 Feb 2024 13:16:38 +0100 Subject: [PATCH 4/6] List files --- .github/workflows/publish-ruby.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish-ruby.yml b/.github/workflows/publish-ruby.yml index 5c56a5255..13839db73 100644 --- a/.github/workflows/publish-ruby.yml +++ b/.github/workflows/publish-ruby.yml @@ -105,6 +105,8 @@ jobs: for ((i=0; i<${#platforms[@]}; i++)); do cp "temp/${platforms[$i]}/${files[$i]}" "languages/ruby/bitwarden_sdk_secrets/lib/${platforms[$i]}/${files[$i]}" done + + ls -lR languages/ruby/bitwarden_sdk_secrets shell: bash - name: Build gem From 9eada08bc1116234fd822519d44c0dc95fdfe657 Mon Sep 17 00:00:00 2001 From: Michal Checinski Date: Thu, 22 Feb 2024 13:18:46 +0100 Subject: [PATCH 5/6] Fix gemspec filename --- .github/workflows/publish-ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-ruby.yml b/.github/workflows/publish-ruby.yml index 13839db73..4a15ab058 100644 --- a/.github/workflows/publish-ruby.yml +++ b/.github/workflows/publish-ruby.yml @@ -110,7 +110,7 @@ jobs: shell: bash - name: Build gem - run: gem build bitwarden-sdk.gemspec + run: gem build bitwarden-sdk-secrets.gemspec working-directory: languages/ruby/bitwarden_sdk_secrets - name: Push gem to Rubygems From 3825fff5c33a1dae1b4885686fe22d9b4cd90e14 Mon Sep 17 00:00:00 2001 From: Michal Checinski Date: Thu, 22 Feb 2024 13:27:26 +0100 Subject: [PATCH 6/6] Remove list --- .github/workflows/publish-ruby.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/publish-ruby.yml b/.github/workflows/publish-ruby.yml index 4a15ab058..2be1eab85 100644 --- a/.github/workflows/publish-ruby.yml +++ b/.github/workflows/publish-ruby.yml @@ -105,8 +105,6 @@ jobs: for ((i=0; i<${#platforms[@]}; i++)); do cp "temp/${platforms[$i]}/${files[$i]}" "languages/ruby/bitwarden_sdk_secrets/lib/${platforms[$i]}/${files[$i]}" done - - ls -lR languages/ruby/bitwarden_sdk_secrets shell: bash - name: Build gem