add option 'install'

Author: eine

.github/workflows/test.yml

@@ -123,8 +123,9 @@ jobs:
   update:
     strategy:
       fail-fast: false
+      max-parallel: 3
       matrix:
-        task: [ MSYS, MINGW64, MINGW32 ]
+        msystem: [ MSYS, MINGW64, MINGW32 ]
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v1
@@ -137,9 +138,9 @@ jobs:
     - name: run action
       uses: ./
       with:
-        update: True
-        msystem: ${{ matrix.task }}
-    - run: msys2do ./test.sh ${{ matrix.task }}
+        update: true
+        msystem: ${{ matrix.msystem }}
+    - run: msys2do ./test.sh ${{ matrix.msystem }}
 
   MSYS2_PATH_TYPE:
     runs-on: windows-latest
@@ -174,3 +175,26 @@ jobs:
       with:
         path-type: inherit
     - run: msys2do go env
+
+  install:
+    strategy:
+      fail-fast: false
+      max-parallel: 3
+      matrix:
+        install: [ false, git, 'base-devel git' ]
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: build action
+      shell: bash
+      run: |
+        npm ci
+        npm run pkg
+        rm -rf node_modules
+    - name: run action
+      uses: ./
+      with:
+        update: true
+        install: ${{ matrix.install }}
+        msystem: MINGW64
+    - run: msys2do ./test.sh MINGW64

action.yml

@@ -13,6 +13,10 @@ inputs:
     description: 'Update MSYS2 installation through pacman'
     required: false
     default: false
+  install:
+    description: 'Install packages after installation through pacman'
+    required: false
+    default: false
 runs:
   using: 'node12'
   main: 'index.js'

main.js

@@ -45,23 +45,34 @@ async function run() {
 
     core.exportVariable('MSYSTEM', core.getInput('msystem'));
 
+    async function pacman(args) {
+      await exec.exec('cmd', ['/D', '/S', '/C', cmd, 'pacman', '--noconfirm'].concat(args));
+    }
+
     core.startGroup('Starting MSYS2 for the first time...');
       if (core.getInput('update') == 'true') {
-        await exec.exec('cmd', ['/D', '/S', '/C', cmd].concat(['pacman', '-Sy', '--noconfirm']));
+        await pacman(['-Sy']);
         core.endGroup();
         core.startGroup('Updating bash and pacman...');
-        await exec.exec('cmd', ['/D', '/S', '/C', cmd].concat(['pacman', '--needed', '-S', 'bash', 'pacman', '--noconfirm']));
+        await pacman(['--needed', '-S', 'bash', 'pacman'])
         core.endGroup();
         core.startGroup('Killing remaining tasks...');
         await exec.exec('taskkill', ['/IM', 'gpg-agent.exe', '/F']);
         await exec.exec('taskkill', ['/IM', 'dirmngr.exe', '/F']);
         core.endGroup();
         core.startGroup('Updating packages...');
-        await exec.exec('cmd', ['/D', '/S', '/C', cmd].concat(['pacman', '-Suu', '--noconfirm']));
+        await pacman(['-Suu']);
       } else {
         await exec.exec('cmd', ['/D', '/S', '/C', cmd].concat(['uname', '-a']));
       }
     core.endGroup();
+
+    let install = core.getInput('install');
+    if (install != '' && install != 'false') {
+      core.startGroup('Installing additional packages...');
+      await pacman(['-S'].concat(install.split(' ')));
+      core.endGroup();
+    }
   }
   catch (error) {
     core.setFailed(error.message);