appveyor.yml: drop unnecessary 1.0. prefix

from version.

Also I fixed the wrong way of using `for:`.
Specifying `for` without `matrix.only` was just useless.
This fix is for adding MinGW matrix in the future.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 81 insertions, 77 deletions

diff --git a/appveyor.yml b/appveyor.yml
index b67830036b..42fe9e7fdd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,9 @@
 ---
+version: '{build}'
 shallow_clone: true
+branches:
+  only:
+    - trunk
 platform:
   - x64
 environment:
@@ -7,85 +11,85 @@ environment:
   zlib_version: "1.2.11"
   matrix:
     - vs: "120"
-install:
-  - ver
-  - chcp
-  - SET BITS=%Platform:x86=32%
-  - SET BITS=%BITS:x=%
-  - SET OPENSSL_DIR=c:\OpenSSL-Win%BITS%
-  - CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat
-  - SET vcvars
-  - '"%vcvars%" %Platform:x64=amd64%'
-  - SET ruby_path=C:\Ruby%ruby_version:-x86=%
-  - SET PATH=\usr\local\bin;%ruby_path%\bin;%PATH%;C:\msys64\mingw64\bin;C:\msys64\usr\bin
-  - ruby --version
-  - 'cl'
-  - SET
-  - echo> Makefile srcdir=.
-  - echo>> Makefile MSC_VER=0
-  - echo>> Makefile RT=none
-  - echo>> Makefile RT_VER=0
-  - echo>> Makefile BUILTIN_ENCOBJS=nul
-  - type win32\Makefile.sub >> Makefile
-  - nmake %mflags% touch-unicode-files
-  - nmake %mflags% up incs UNICODE_FILES=.
-  - del Makefile
-  - mkdir \usr\local\bin
-  - mkdir \usr\local\include
-  - mkdir \usr\local\lib
-  - appveyor DownloadFile https://zlib.net/zlib%zlib_version:.=%.zip
-  - 7z x -o%APPVEYOR_BUILD_FOLDER%\ext\zlib zlib%zlib_version:.=%.zip
-  - for %%I in (%OPENSSL_DIR%\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
-  - mkdir %Platform%-mswin_%vs%
-  - ps: Get-ChildItem "win32" -Recurse | foreach {$_.Attributes = 'Readonly'}
-  - ps: Get-Item $env:Platform"-mswin_"$env:vs | foreach {$_.Attributes = 'Normal'}
-build_script:
-  - cd %APPVEYOR_BUILD_FOLDER%
-  - cd %Platform%-mswin_%vs%
-  - ..\win32\configure.bat --without-ext=+,dbm,gdbm,readline --with-opt-dir=/usr/local --with-openssl-dir=%OPENSSL_DIR:\=/%
-  - nmake -l
-  - nmake install-nodoc
-  - \usr\bin\ruby -v -e "p :locale => Encoding.find('locale'), :filesystem => Encoding.find('filesystem')"
-test_script:
-  - set /a JOBS=%NUMBER_OF_PROCESSORS%
-  - nmake -l "TESTOPTS=-v -q" btest
-  - nmake -l "TESTOPTS=-v -q" test-basic
-  - nmake -l "TESTOPTS=-q -j%JOBS%" test-all RUBY_FORCE_TEST_JIT=1
-  - nmake -l test-spec
 matrix:
   fast_finish: true
+notifications:
+  - provider: Webhook
+    url:
+      secure: iMINHMS0nZabaDsxN9omRDsekxzVvAAzEq5ev7lN6vZ6r9zNhl3/F/7POIVyahAwVFpRDeQT/iUugpAGWmOt3eGL/lZIdqiJFZ9DjPSkP68= # #alerts
+    method: POST
+    # "icon_url" is the url used by `provider: Slack`
+    body: >-
+      {{^isPullRequest}}
+        {
+          "attachments": [
+            {
+              "title": "Build {{projectName}} {{buildVersion}} {{status}}",
+              "fallback": "AppVeyor Build {{projectName}} {{buildVersion}} {{status}}",
+              "title_link": "{{buildUrl}}",
+              "text": "Commit <{{commitUrl}}|{{commitId}}> by {{commitAuthor}} on {{commitDate}}: _{{commitMessage}}_",
+              {{#passed}}
+                "color": "#44ee44"
+              {{/passed}}
+              {{#failed}}
+                "color": "#ee4444"
+              {{/failed}}
+            }
+          ],
+          "icon_url": "https://slack-files2.s3-us-west-2.amazonaws.com/bot_icons/2018-02-10/314363543719_48.png",
+          "username": "AppVeyor CI"
+        }
+      {{/isPullRequest}}
+    on_build_success: false
+    on_build_failure: true
+    on_build_status_changed: true
 for:
 -
-  branches:
+  matrix:
     only:
-      - trunk
-  notifications:
-    - provider: Webhook
-      url:
-        secure: iMINHMS0nZabaDsxN9omRDsekxzVvAAzEq5ev7lN6vZ6r9zNhl3/F/7POIVyahAwVFpRDeQT/iUugpAGWmOt3eGL/lZIdqiJFZ9DjPSkP68= # #alerts
-      method: POST
-      # "icon_url" is the url used by `provider: Slack`
-      body: >-
-        {{^isPullRequest}}
-          {
-            "attachments": [
-              {
-                "title": "Build {{projectName}} {{buildVersion}} {{status}}",
-                "fallback": "AppVeyor Build {{projectName}} {{buildVersion}} {{status}}",
-                "title_link": "{{buildUrl}}",
-                "text": "Commit <{{commitUrl}}|{{commitId}}> by {{commitAuthor}} on {{commitDate}}: _{{commitMessage}}_",
-                {{#passed}}
-                  "color": "#44ee44"
-                {{/passed}}
-                {{#failed}}
-                  "color": "#ee4444"
-                {{/failed}}
-              }
-            ],
-            "icon_url": "https://slack-files2.s3-us-west-2.amazonaws.com/bot_icons/2018-02-10/314363543719_48.png",
-            "username": "AppVeyor CI"
-          }
-        {{/isPullRequest}}
-      on_build_success: false
-      on_build_failure: true
-      on_build_status_changed: true
+      - vs: "120"
+  install:
+    - ver
+    - chcp
+    - SET BITS=%Platform:x86=32%
+    - SET BITS=%BITS:x=%
+    - SET OPENSSL_DIR=c:\OpenSSL-Win%BITS%
+    - CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat
+    - SET vcvars
+    - '"%vcvars%" %Platform:x64=amd64%'
+    - SET ruby_path=C:\Ruby%ruby_version:-x86=%
+    - SET PATH=\usr\local\bin;%ruby_path%\bin;%PATH%;C:\msys64\mingw64\bin;C:\msys64\usr\bin
+    - ruby --version
+    - 'cl'
+    - SET
+    - echo> Makefile srcdir=.
+    - echo>> Makefile MSC_VER=0
+    - echo>> Makefile RT=none
+    - echo>> Makefile RT_VER=0
+    - echo>> Makefile BUILTIN_ENCOBJS=nul
+    - type win32\Makefile.sub >> Makefile
+    - nmake %mflags% touch-unicode-files
+    - nmake %mflags% up incs UNICODE_FILES=.
+    - del Makefile
+    - mkdir \usr\local\bin
+    - mkdir \usr\local\include
+    - mkdir \usr\local\lib
+    - appveyor DownloadFile https://zlib.net/zlib%zlib_version:.=%.zip
+    - 7z x -o%APPVEYOR_BUILD_FOLDER%\ext\zlib zlib%zlib_version:.=%.zip
+    - for %%I in (%OPENSSL_DIR%\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
+    - mkdir %Platform%-mswin_%vs%
+    - ps: Get-ChildItem "win32" -Recurse | foreach {$_.Attributes = 'Readonly'}
+    - ps: Get-Item $env:Platform"-mswin_"$env:vs | foreach {$_.Attributes = 'Normal'}
+  build_script:
+    - cd %APPVEYOR_BUILD_FOLDER%
+    - cd %Platform%-mswin_%vs%
+    - ..\win32\configure.bat --without-ext=+,dbm,gdbm,readline --with-opt-dir=/usr/local --with-openssl-dir=%OPENSSL_DIR:\=/%
+    - nmake -l
+    - nmake install-nodoc
+    - \usr\bin\ruby -v -e "p :locale => Encoding.find('locale'), :filesystem => Encoding.find('filesystem')"
+  test_script:
+    - set /a JOBS=%NUMBER_OF_PROCESSORS%
+    - nmake -l "TESTOPTS=-v -q" btest
+    - nmake -l "TESTOPTS=-v -q" test-basic
+    - nmake -l "TESTOPTS=-q -j%JOBS%" test-all RUBY_FORCE_TEST_JIT=1
+    - nmake -l test-spec