Ruby: Use correct binary for linux build

github · Mar 23, 2023 · 6d50ed5 · 6d50ed5
1 parent 45797b3
commit 6d50ed5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/.github/workflows/ruby-build.yml b/.github/workflows/ruby-build.yml
@@ -60,8 +60,10 @@ jobs:
           path: |
             ruby/extractor/target/release/autobuilder
             ruby/extractor/target/release/autobuilder.exe
+            ruby/extractor/target/x86_64-unknown-linux-gnu/release/autobuilder
             ruby/extractor/target/release/extractor
             ruby/extractor/target/release/extractor.exe
+            ruby/extractor/target/x86_64-unknown-linux-gnu/release/extractor
             ruby/extractor/ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
           key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-ruby-extractor-${{ hashFiles('ruby/extractor/rust-toolchain.toml', 'ruby/extractor/Cargo.lock') }}--${{ hashFiles('ruby/extractor/**/*.rs') }}
       - uses: actions/cache@v3
@@ -85,13 +87,19 @@ jobs:
       # This ensures we don't depend on glibc > 2.17.
       - name: Release build (linux)
         if: steps.cache-extractor.outputs.cache-hit != 'true' && runner.os == 'Linux'
-        run: cd extractor && cross build --release
+        run: |
+          cd extractor
+          cross build --release
+          mv target/x86_64-unknown-linux-gnu/release/extractor target/release/
+          mv target/x86_64-unknown-linux-gnu/release/autobuilder target/release/
+          mv target/x86_64-unknown-linux-gnu/release/generator target/release/
       - name: Release build (windows and macos)
         if: steps.cache-extractor.outputs.cache-hit != 'true' && runner.os != 'Linux'
         run: cd extractor && cargo build --release
       - name: Generate dbscheme
         if: ${{ matrix.os == 'ubuntu-latest' && steps.cache-extractor.outputs.cache-hit != 'true'}}
-        run: extractor/target/release/generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
+        run: |
+          extractor/target/release/generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
       - uses: actions/upload-artifact@v3
         if: ${{ matrix.os == 'ubuntu-latest' }}
         with:
@@ -108,8 +116,10 @@ jobs:
           path: |
             ruby/extractor/target/release/autobuilder
             ruby/extractor/target/release/autobuilder.exe
+            ruby/extractor/target/release/autobuilder
             ruby/extractor/target/release/extractor
             ruby/extractor/target/release/extractor.exe
+            ruby/extractor/target/release/extractor
           retention-days: 1
   compile-queries:
     runs-on: ubuntu-latest-xl