Merge pull request #19 from oneapi-src/dev/beta10

Switch to Beta10, install logs as artifacts, download retries, Windows in CircleCI

Author: mmzakhar

.appveyor.yml

@@ -4,15 +4,15 @@
 
 environment:
   global:
-    WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/16958/w_BaseKit_b_2021.1.9.2200.exe
-    WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/16959/w_HPCKit_b_2021.1.9.2229.exe
-    MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/16956/m_HPCKit_b_2021.1.9.2197.dmg
+    WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17191/w_BaseKit_b_2021.1.10.2260.exe
+    WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17163/w_HPCKit_b_2021.1.10.2266.exe
+    MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17230/m_HPCKit_b_2021.1.10.2260.dmg
     WINDOWS_CPP_COMPONENTS: intel.oneapi.win.cpp-compiler
     WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
     WINDOWS_DPCPP_COMPONENTS: intel.oneapi.win.dpcpp-compiler
-    LINUX_CPP_COMPONENTS: intel-oneapi-icc
-    LINUX_FORTRAN_COMPONENTS: intel-oneapi-ifort,intel-oneapi-compiler-shared-2021.1-beta09
-    LINUX_DPCPP_COMPONENTS: intel-oneapi-dpcpp-compiler
+    LINUX_CPP_COMPONENTS: intel-oneapi-dpcpp-cpp-compiler-pro
+    LINUX_FORTRAN_COMPONENTS: intel-oneapi-ifort
+    LINUX_DPCPP_COMPONENTS: intel-oneapi-dpcpp-cpp-compiler
     MACOS_CPP_COMPONENTS: intel.oneapi.mac.cpp-compiler
     MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
 
@@ -50,6 +50,12 @@ for:
       cmd: scripts/install_windows.bat %WINDOWS_HPCKIT_URL% %WINDOWS_CPP_COMPONENTS%
     build_script:
       cmd: scripts/build_windows.bat c++
+    artifacts:
+      - name: InstallLogs
+        path: |
+          extract.log
+          bootstrapper*
+          installer*
   -
     matrix:
       only:
@@ -58,6 +64,12 @@ for:
       cmd: scripts/install_windows.bat %WINDOWS_HPCKIT_URL% %WINDOWS_FORTRAN_COMPONENTS%
     build_script:
       cmd: scripts/build_windows.bat fortran
+    artifacts:
+      - name: InstallLogs
+        path: |
+          extract.log
+          bootstrapper*
+          installer*
   -
     matrix:
       only:
@@ -66,6 +78,12 @@ for:
       cmd: scripts/install_windows.bat %WINDOWS_BASEKIT_URL% %WINDOWS_DPCPP_COMPONENTS%
     build_script:
       cmd: scripts/build_windows.bat dpc++
+    artifacts:
+      - name: InstallLogs
+        path: |
+          extract.log
+          bootstrapper*
+          installer*
   -
     matrix:
       only:
@@ -90,6 +108,7 @@ for:
       sh: scripts/install_linux_apt.sh $LINUX_DPCPP_COMPONENTS
     build_script:
       sh: scripts/build_linux.sh dpc++
+      
   -
     matrix:
       only:
@@ -98,6 +117,11 @@ for:
       sh: scripts/install_macos.sh $MACOS_HPCKIT_URL $MACOS_CPP_COMPONENTS
     build_script:
       sh: scripts/build_macos.sh c++
+    artifacts:
+      - name: InstallLogs
+        path: |
+          bootstrapper*
+          installer*
   -
     matrix:
       only:
@@ -106,4 +130,8 @@ for:
       sh: scripts/install_macos.sh $MACOS_HPCKIT_URL $MACOS_FORTRAN_COMPONENTS
     build_script:
       sh: scripts/build_macos.sh fortran
-      
+    artifacts:
+      - name: InstallLogs
+        path: |
+          bootstrapper*
+          installer*

.azure-pipelines.yml

@@ -7,23 +7,23 @@ trigger:
 
 variables:
   - name: WINDOWS_BASEKIT_URL
-    value: https://registrationcenter-download.intel.com/akdlm/irc_nas/16958/w_BaseKit_b_2021.1.9.2200.exe
+    value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17191/w_BaseKit_b_2021.1.10.2260.exe
   - name: WINDOWS_HPCKIT_URL
-    value: https://registrationcenter-download.intel.com/akdlm/irc_nas/16959/w_HPCKit_b_2021.1.9.2229.exe
+    value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17163/w_HPCKit_b_2021.1.10.2266.exe
   - name: MACOS_HPCKIT_URL
-    value: https://registrationcenter-download.intel.com/akdlm/irc_nas/16956/m_HPCKit_b_2021.1.9.2197.dmg
+    value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17230/m_HPCKit_b_2021.1.10.2260.dmg
   - name: WINDOWS_CPP_COMPONENTS
     value: intel.oneapi.win.cpp-compiler
   - name: WINDOWS_FORTRAN_COMPONENTS
     value: intel.oneapi.win.ifort-compiler
   - name: WINDOWS_DPCPP_COMPONENTS
     value: intel.oneapi.win.dpcpp-compiler
   - name: LINUX_CPP_COMPONENTS
-    value: intel-oneapi-icc
+    value: intel-oneapi-dpcpp-cpp-compiler-pro
   - name: LINUX_FORTRAN_COMPONENTS
-    value: intel-oneapi-ifort,intel-oneapi-compiler-shared-2021.1-beta09
+    value: intel-oneapi-ifort
   - name: LINUX_DPCPP_COMPONENTS
-    value: intel-oneapi-dpcpp-compiler
+    value: intel-oneapi-dpcpp-cpp-compiler
   - name: MACOS_CPP_COMPONENTS
     value: intel.oneapi.mac.cpp-compiler
   - name: MACOS_FORTRAN_COMPONENTS
@@ -47,6 +47,20 @@ jobs:
     displayName: install
   - script: scripts/build_windows.bat c++
     displayName: build
+  - task: CopyFiles@2
+    condition: always()
+    inputs:
+      sourceFolder: '$(Build.SourcesDirectory)'
+      contents: |
+        extract.log
+        bootstrapper*
+        installer*
+      targetFolder: '$(Build.ArtifactStagingDirectory)'
+  - task: PublishBuildArtifacts@1
+    condition: always()
+    inputs:
+      pathToPublish: '$(Build.ArtifactStagingDirectory)'
+      artifactName: InstallLogs_$(Agent.JobName)
 
 - job: build_windows_fortran
   pool:
@@ -56,6 +70,20 @@ jobs:
     displayName: install
   - script: scripts/build_windows.bat fortran
     displayName: build
+  - task: CopyFiles@2
+    condition: always()
+    inputs:
+      sourceFolder: '$(Build.SourcesDirectory)'
+      contents: |
+        extract.log
+        bootstrapper*
+        installer*
+      targetFolder: '$(Build.ArtifactStagingDirectory)'
+  - task: PublishBuildArtifacts@1
+    condition: always()
+    inputs:
+      pathToPublish: '$(Build.ArtifactStagingDirectory)'
+      artifactName: InstallLogs_$(Agent.JobName)
 
 - job: build_windows_dpcpp
   pool:
@@ -65,6 +93,20 @@ jobs:
     displayName: install
   - script: scripts/build_windows.bat dpc++
     displayName: build
+  - task: CopyFiles@2
+    condition: always()
+    inputs:
+      sourceFolder: '$(Build.SourcesDirectory)'
+      contents: |
+        extract.log
+        bootstrapper*
+        installer*
+      targetFolder: '$(Build.ArtifactStagingDirectory)'
+  - task: PublishBuildArtifacts@1
+    condition: always()
+    inputs:
+      pathToPublish: '$(Build.ArtifactStagingDirectory)'
+      artifactName: InstallLogs_$(Agent.JobName)
 
 - job: build_linux_apt_cpp
   pool:
@@ -131,6 +173,19 @@ jobs:
     displayName: install
   - script: scripts/build_macos.sh c++
     displayName: build
+  - task: CopyFiles@2
+    condition: always()
+    inputs:
+      sourceFolder: '$(Build.SourcesDirectory)'
+      contents: |
+        bootstrapper*
+        installer*
+      targetFolder: '$(Build.ArtifactStagingDirectory)'
+  - task: PublishBuildArtifacts@1
+    condition: always()
+    inputs:
+      pathToPublish: '$(Build.ArtifactStagingDirectory)'
+      artifactName: InstallLogs_$(Agent.JobName)
 
 - job: build_macOS_fortran
   pool:
@@ -140,4 +195,17 @@ jobs:
     displayName: install
   - script: scripts/build_macos.sh fortran
     displayName: build
+  - task: CopyFiles@2
+    condition: always()
+    inputs:
+      sourceFolder: '$(Build.SourcesDirectory)'
+      contents: |
+        bootstrapper*
+        installer*
+      targetFolder: '$(Build.ArtifactStagingDirectory)'
+  - task: PublishBuildArtifacts@1
+    condition: always()
+    inputs:
+      pathToPublish: '$(Build.ArtifactStagingDirectory)'
+      artifactName: InstallLogs_$(Agent.JobName)
 

.circleci/config.yml

@@ -16,10 +16,17 @@ jobs:
       - checkout
       - run:
           name: install
-          command: scripts/install_windows.bat https://registrationcenter-download.intel.com/akdlm/irc_nas/16959/w_HPCKit_b_2021.1.9.2229.exe intel.oneapi.win.cpp-compiler
+          command: scripts/install_windows.bat https://registrationcenter-download.intel.com/akdlm/irc_nas/17163/w_HPCKit_b_2021.1.10.2266.exe intel.oneapi.win.cpp-compiler
       - run:
           name: build
           command: scripts/build_windows.bat c++ 2017_build_tools
+      - run:
+          command: |
+            mkdir InstallLogs
+            cp extract* bootstrapper* installer* InstallLogs
+          when: always
+      - store_artifacts:
+          path: InstallLogs
 
   build_windows_fortran:
     executor:
@@ -29,10 +36,17 @@ jobs:
       - checkout
       - run:
           name: install
-          command: scripts/install_windows.bat https://registrationcenter-download.intel.com/akdlm/irc_nas/16959/w_HPCKit_b_2021.1.9.2229.exe intel.oneapi.win.ifort-compiler
+          command: scripts/install_windows.bat https://registrationcenter-download.intel.com/akdlm/irc_nas/17163/w_HPCKit_b_2021.1.10.2266.exe intel.oneapi.win.ifort-compiler
       - run:
           name: build
           command: scripts/build_windows.bat fortran 2017_build_tools
+      - run:
+          command: |
+            mkdir InstallLogs
+            cp extract* bootstrapper* installer* InstallLogs
+          when: always
+      - store_artifacts:
+          path: InstallLogs
 
   build_windows_dpcpp:
     executor:
@@ -42,10 +56,17 @@ jobs:
       - checkout
       - run:
           name: install
-          command: scripts/install_windows.bat https://registrationcenter-download.intel.com/akdlm/irc_nas/16958/w_BaseKit_b_2021.1.9.2200.exe intel.oneapi.win.dpcpp-compiler
+          command: scripts/install_windows.bat https://registrationcenter-download.intel.com/akdlm/irc_nas/17191/w_BaseKit_b_2021.1.10.2260.exe intel.oneapi.win.dpcpp-compiler
       - run:
           name: build
           command: scripts/build_windows.bat dpc++ 2017_build_tools
+      - run:
+          command: |
+            mkdir InstallLogs
+            cp extract* bootstrapper* installer* InstallLogs
+          when: always
+      - store_artifacts:
+          path: InstallLogs
 
   build_linux_apt_cpp:
     docker:
@@ -54,7 +75,7 @@ jobs:
       - checkout
       - run:
           name: install
-          command: . scripts/install_linux_apt_no_sudo.sh intel-oneapi-icc
+          command: . scripts/install_linux_apt_no_sudo.sh intel-oneapi-dpcpp-cpp-compiler-pro
       - run:
           name: build
           command: scripts/build_linux.sh c++
@@ -66,7 +87,7 @@ jobs:
       - checkout
       - run:
           name: install
-          command: . scripts/install_linux_apt_no_sudo.sh intel-oneapi-ifort,intel-oneapi-compiler-shared-2021.1-beta09
+          command: . scripts/install_linux_apt_no_sudo.sh intel-oneapi-ifort
       - run:
           name: build
           command: scripts/build_linux.sh fortran
@@ -78,7 +99,7 @@ jobs:
       - checkout
       - run:
           name: install
-          command: . scripts/install_linux_apt_no_sudo.sh intel-oneapi-dpcpp-compiler
+          command: . scripts/install_linux_apt_no_sudo.sh intel-oneapi-dpcpp-cpp-compiler
       - run:
           name: build
           command: scripts/build_linux.sh dpc++
@@ -122,6 +143,9 @@ jobs:
 workflows:
   build-all:
     jobs:
+    - build_windows_cpp
+    - build_windows_fortran
+    - build_windows_dpcpp
     - build_linux_apt_cpp
     - build_linux_apt_fortran
     - build_linux_apt_dpcpp