Merge pull request #193 from shoo/update_ci

CI関連の更新
dlang-jp · Sep 23, 2023 · 3cea87a · 3cea87a
2 parents af59b78 + 050de02
commit 3cea87a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 53 deletions.
diff --git a/.github/runner.d b/.github/runner.d
@@ -19,9 +19,10 @@ static:
     /// テスト対象にするサブパッケージを指定します。
     /// サブパッケージが追加されたらここにも追加してください。
     immutable subPkgs = [
-        PackageInfo("windows"),
+        PackageInfo("asdf_usage"),
         PackageInfo("libdparse_usage"),
-        PackageInfo("vibe-d_usage", ["windows-x86_omf-", "linux-x86-", "osx-x86-"])
+        PackageInfo("vibe-d_usage", ["windows-x86_omf-", "linux-x86-", "osx-x86-"]),
+        PackageInfo("windows"),
     ];
 }
 
@@ -138,8 +139,8 @@ void unitTest(string[] exDubOpts = null)
 {
     if (!".cov".exists)
         mkdir(".cov");
-    auto opt = ["-v", "-a", config.arch, "--compiler", config.compiler, "--coverage", "--main-file", ".github/ut.d"]
-        ~ exDubOpts;
+    auto opt = ["-v", "-a", config.arch, "--compiler", config.compiler, "--coverage"]
+        ~ exDubOpts ~ "--" ~ getCovOpt();
     string[string] env;
     env.addCurlPath();
     exec(["dub", "test"] ~ opt, null, env);
@@ -454,3 +455,14 @@ bool matchArch(in string[] exceptArchs)
     }
     return false;
 }
+
+string[] getCovOpt()
+{
+    enum rootDir = __FILE__.dirName.dirName.buildNormalizedPath();
+    enum covDir  = rootDir.buildNormalizedPath(".cov");
+    if (!covDir.exists)
+        mkdirRecurse(covDir);
+    return ["--DRT-covopt=dstpath:" ~ covDir,
+        "--DRT-covopt=srcpath:" ~ rootDir,
+        "--DRT-covopt=merge:1"];
+}
diff --git a/.github/ut.d b/.github/ut.d
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - test
 
 jobs:
   # 各テストのジョブは以下の表に従って作成しています。
@@ -58,13 +59,13 @@ jobs:
   #      run: rdmd ./.github/runner.d -a=${ARCH} --mode=generate-document
   #    # ドキュメントを記録する場合は以下を実行(Artifactに6か月保管されます)
   #    - name: Upload generated pages
-  #      uses: actions/upload-artifact@v1
+  #      uses: actions/upload-artifact@v3
   #      with:
   #        name: docs
   #        path: docs
   #    # カバレッジを記録する場合は以下を実行(Artifactに6か月保管されます)
   #    - name: Upload coverage result
-  #      uses: actions/upload-artifact@v1
+  #      uses: actions/upload-artifact@v3
   #      with:
   #        name: coverage-${OS}
   #        path: .cov
@@ -112,7 +113,7 @@ jobs:
       - name: Generate document tests
         run: rdmd ./.github/runner.d -a=x86_64 --mode=generate-document
       - name: Upload coverage result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: coverage-windows
           path: .cov
@@ -226,12 +227,12 @@ jobs:
       - name: Generate document tests
         run: rdmd ./.github/runner.d -a=x86_64 --mode=generate-document
       - name: Upload generated pages
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: docs
           path: docs
       - name: Upload coverage result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: coverage-linux
           path: .cov
@@ -246,10 +247,7 @@ jobs:
       - name: Install D compiler
         uses: dlang-community/setup-dlang@v1
         with:
-          # 現在dmd-masterは機能していない(2020-03-10以降更新が停止)
-          #compiler: dmd-master
-          # 暫定的に dmd-beta を使用する
-          compiler: dmd-beta
+          compiler: dmd-master
       - name: Run unit tests
         run: rdmd ./.github/runner.d -a=x86_64 --mode=unit-test
 
@@ -304,7 +302,7 @@ jobs:
       - name: Generate document tests
         run: rdmd ./.github/runner.d -a=x86_64 --mode=generate-document
       - name: Upload coverage result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: coverage-osx
           path: .cov
@@ -336,17 +334,17 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Download Windows coverage result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: coverage-windows
           path: .cov-windows
       - name: Download Linux coverage result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: coverage-linux
           path: .cov-linux
       - name: Download OSX coverage result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: coverage-osx
           path: .cov-osx
@@ -360,7 +358,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download generated pages
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: docs
       - name: Deploy pages

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -55,13 +55,13 @@ jobs:
   #      run: rdmd ./.github/runner.d -a=${ARCH} --mode=generate-document
   #    # ドキュメントを記録する場合は以下を実行(Artifactに6か月保管されます)
   #    - name: Upload generated pages
-  #      uses: actions/upload-artifact@v1
+  #      uses: actions/upload-artifact@v3
   #      with:
   #        name: docs
   #        path: docs
   #    # カバレッジを記録する場合は以下を実行(Artifactに6か月保管されます)
   #    - name: Upload coverage result
-  #      uses: actions/upload-artifact@v1
+  #      uses: actions/upload-artifact@v3
   #      with:
   #        name: coverage-${OS}
   #        path: .cov
@@ -109,7 +109,7 @@ jobs:
       - name: Generate document tests
         run: rdmd ./.github/runner.d -a=x86_64 --mode=generate-document
       - name: Upload coverage result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: coverage-windows
           path: .cov
@@ -223,12 +223,12 @@ jobs:
       - name: Generate document tests
         run: rdmd ./.github/runner.d -a=x86_64 --mode=generate-document
       - name: Upload generated pages
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: docs
           path: docs
       - name: Upload coverage result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: coverage-linux
           path: .cov
@@ -243,10 +243,7 @@ jobs:
       - name: Install D compiler
         uses: dlang-community/setup-dlang@v1
         with:
-          # 現在dmd-masterは機能していない(2020-03-10以降更新が停止)
-          #compiler: dmd-master
-          # 暫定的に dmd-beta を使用する
-          compiler: dmd-beta
+          compiler: dmd-master
       - name: Run unit tests
         run: rdmd ./.github/runner.d -a=x86_64 --mode=unit-test
 
@@ -301,7 +298,7 @@ jobs:
       - name: Generate document tests
         run: rdmd ./.github/runner.d -a=x86_64 --mode=generate-document
       - name: Upload coverage result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: coverage-osx
           path: .cov
@@ -334,17 +331,17 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Download Windows coverage result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: coverage-windows
           path: .cov-windows
       - name: Download Linux coverage result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: coverage-linux
           path: .cov-linux
       - name: Download OSX coverage result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: coverage-osx
           path: .cov-osx

diff --git a/thirdparty/vibe-d/source/vibed_usage/rest.d b/thirdparty/vibe-d/source/vibed_usage/rest.d
@@ -137,7 +137,7 @@ unittest
             thrown = e;
     });
 
-    auto exitCode = runApplication();
+    auto exitCode = runEventLoop();
     assert(exitCode == 0, "exit code: ".text(exitCode));
     assert(!thrown, thrown.toString());