From 5f02b049d9097fc231862bf1dad01b9d9d4dc1b7 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Thu, 29 Jul 2021 18:05:14 -0500 Subject: [PATCH] Add pkgconf to gcc packages --- .github/{ => workflows}/dependabot.yml | 0 .github/workflows/ruby.yml | 2 +- mingw.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename .github/{ => workflows}/dependabot.yml (100%) diff --git a/.github/dependabot.yml b/.github/workflows/dependabot.yml similarity index 100% rename from .github/dependabot.yml rename to .github/workflows/dependabot.yml diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 5bb4f06..67ff28b 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, ubuntu-18.04, macos-10.15 ] - ruby: [ ruby-head, 2.7, 2.5, 2.2, jruby, truffleruby ] + ruby: [ ruby-head, '3.0', 2.7, 2.5, 2.2, jruby, truffleruby ] runs-on: ${{ matrix.os }} steps: - name: Checkout diff --git a/mingw.js b/mingw.js index 98e5473..4d5f907 100644 --- a/mingw.js +++ b/mingw.js @@ -99,7 +99,7 @@ const updateGCC = async () => { // TODO: code for installing gcc 9.2.0-1 or 9.1.0-3 msSt = grpSt(`Upgrading gcc for Ruby ${ruby.vers}`) - let gccPkgs = ['', 'binutils', 'crt', 'dlfcn', 'headers', 'libiconv', 'isl', 'make', 'mpc', 'mpfr', 'windows-default-manifest', 'libwinpthread', 'libyaml', 'winpthreads', 'zlib', 'gcc-libs', 'gcc'] + let gccPkgs = ['', 'binutils', 'crt', 'dlfcn', 'headers', 'libiconv', 'isl', 'make', 'mpc', 'mpfr', 'pkgconf', 'windows-default-manifest', 'libwinpthread', 'libyaml', 'winpthreads', 'zlib', 'gcc-libs', 'gcc'] execSync(`pacman.exe ${msys2Sync} --nodeps ${args} ${gccPkgs.join(pre)}`) grpEnd(msSt)