CI: Place test samples in ci directory

Signed-off-by: Hiroshi Miura <[email protected]>
Kidev · Nov 23, 2019 · 40c4773 · 40c4773
1 parent d6805d4
commit 40c4773
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 17 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -8,6 +8,7 @@ include tox.ini
 recursive-include aqt *.ini
 recursive-include aqt *.json
 recursive-include aqt *.yml
+recursive-include ci *.7z
 recursive-include ci *.py
 recursive-include ci *.yml
 recursive-include docs *.bat
@@ -19,14 +20,4 @@ recursive-include docs *.svg
 recursive-include docs *.html
 recursive-include docs *.txt
 recursive-include docs Makefile
-recursive-include tests *.conf
-recursive-include tests *.cpp
-recursive-include tests *.pro
-recursive-include tests *.qml
-recursive-include tests *.qrc
-recursive-include tests *.svg
-recursive-include tests *.h
-recursive-include tests *.pri
-recursive-include tests *.png
-recursive-include tests *.qdoc
 recursive-include tests *.py
diff --git a/tests/accelbubble.7z → ci/accelbubble.7z b/tests/accelbubble.7z → ci/accelbubble.7z
diff --git a/tests/helloworld.7z → ci/helloworld.7z b/tests/helloworld.7z → ci/helloworld.7z
diff --git a/tests/openglwindow.7z → ci/openglwindow.7z b/tests/openglwindow.7z → ci/openglwindow.7z
diff --git a/tests/redditclient.7z → ci/redditclient.7z b/tests/redditclient.7z → ci/redditclient.7z
diff --git a/ci/steps.yml b/ci/steps.yml
@@ -64,7 +64,7 @@ steps:
   - script: |
       export ANDROID_NDK_ROOT=$(Build.SourcesDirectory)/android-ndk-r20b
       mkdir $(Build.BinariesDirectory)/tests
-      (cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/tests/accelbubble.7z)
+      (cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/ci/accelbubble.7z)
       $(Build.BinariesDirectory)/Qt/$(QT_VERSION)/$(ARCHDIR)/bin/qmake $(Build.BinariesDirectory)/tests/accelbubble && make
     condition: and(eq(variables['TARGET'], 'android'), or(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OS'], 'Darwin')))
     displayName: Build accelbubble example application to test for android
@@ -106,15 +106,15 @@ steps:
       Import-VisualStudioVars -VisualStudioVersion $(VSVER) -Architecture $(ARCHITECTURE)
       mkdir $(Build.BinariesDirectory)/tests
       cd $(Build.BinariesDirectory)/tests
-      7z x $(Build.SourcesDirectory)/tests/helloworld.7z
+      7z x $(Build.SourcesDirectory)/ci/helloworld.7z
       cd ..
       $(Build.BinariesDirectory)/Qt/$(QT_VERSION)/$(ARCHDIR)/bin/qmake $(Build.BinariesDirectory)/tests/helloworld
       nmake
     condition: and(eq( variables['Agent.OS'], 'Windows_NT'), eq(variables['TOOLCHAIN'], 'MSVC'), eq(variables['MODULE'], ''))
     displayName: build test with qmake with MSVC w/o extra module
   - script: |
       mkdir $(Build.BinariesDirectory)/tests
-      (cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/tests/helloworld.7z)
+      (cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/ci/helloworld.7z)
       $(Build.BinariesDirectory)/Qt/$(QT_VERSION)/$(ARCHDIR)/bin/qmake $(Build.BinariesDirectory)/tests/helloworld
       make
     condition: and(eq( variables['TARGET'], 'desktop' ), ne( variables['ARCH'], 'wasm_32' ), or(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OS'], 'Darwin')), eq(variables['MODULE'], ''))
@@ -124,15 +124,15 @@ steps:
       Import-VisualStudioVars -VisualStudioVersion $(VSVER) -Architecture $(ARCHITECTURE)
       mkdir $(Build.BinariesDirectory)/tests
       cd $(Build.BinariesDirectory)/tests
-      7z x $(Build.SourcesDirectory)/tests/redditclient.7z
+      7z x $(Build.SourcesDirectory)/ci/redditclient.7z
       cd ..
       $(Build.BinariesDirectory)/Qt/$(QT_VERSION)/$(ARCHDIR)/bin/qmake $(Build.BinariesDirectory)/tests/redditclient
       nmake
     condition: and(eq( variables['Agent.OS'], 'Windows_NT'), eq(variables['TOOLCHAIN'], 'MSVC'), ne(variables['MODULE'], ''))
     displayName: build test with qmake with MSVC with extra module
   - script: |
       mkdir $(Build.BinariesDirectory)/tests
-      (cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/tests/redditclient.7z)
+      (cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/ci/redditclient.7z)
       $(Build.BinariesDirectory)/Qt/$(QT_VERSION)/$(ARCHDIR)/bin/qmake $(Build.BinariesDirectory)/tests/redditclient
       make
     condition: and(eq( variables['TARGET'], 'desktop' ), or(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OS'], 'Darwin')), ne(variables['MODULE'], ''))
@@ -174,7 +174,7 @@ steps:
   - script: |
       source $(Build.BinariesDirectory)/emsdk/emsdk_env.sh
       mkdir $(Build.BinariesDirectory)/tests
-      (cd $(Build.BinariesDirectory/tests; 7zr x $(Build.SourcesDirectory)/tests/openglwindow.7z)
+      (cd $(Build.BinariesDirectory/tests; 7zr x $(Build.SourcesDirectory)/ci/openglwindow.7z)
       $(Build.BinariesDirectory)/Qt/$(QT_VERSION)/$(ARCHDIR)/bin/qmake $(Build.BinariesDirectory)/tests/openglwindow && make
     workingDirectory: $(Build.BinariesDirectory)
     condition: and(eq( variables['ARCH'], 'wasm_32' ), or(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OS'], 'Darwin')))

diff --git a/docs/conf.py b/docs/conf.py
@@ -291,4 +291,6 @@
                       'issue ')}
 
 #-- Options for linkcheck
-linkcheck_ignore = [r'https://github.com/miurahr/aqtinstall/compare/.+']
+linkcheck_ignore = [r'https://github.com/miurahr/aqtinstall/compare/.+',
+                    'http://mirrors.tuna.tsinghua.edu.cn',
+                    'http://mirrors.geekpie.club/']