Changeset 68f6c9 in git for .github/workflows

Timestamp:

Feb 19, 2021, 6:49:16 PM (3 years ago)

Author:

Matthias Koeppe <mkoeppe@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

39d022e97bd4ab8f3d69c329dbbe82df1584e237

Parents:

b1d05db4b7eb9b213112ad9f8d89f45fd8513c79

git-author:

Matthias Koeppe <mkoeppe@math.ucdavis.edu>2021-02-19 09:49:16-08:00

git-committer:

Matthias Koeppe <mkoeppe@math.ucdavis.edu>2021-02-22 08:32:14-08:00

Message:

.github/workflows/ci-sage.yml: Update for new Cygwin workflow from Sage ticket #31064

File:

• .github/workflows/ci-sage.yml (modified) (4 diffs)

.github/workflows/ci-sage.yml

@@ -56 +56 @@
   SAGE_REPO:   sagemath/sage
   SAGE_REF:    develop
-  # Temporarily test on the branch from sage ticket for singular 4.1.3 upgrade
+  # Temporarily test on the branch from sage ticket for singular 4.2 upgrade
   SAGE_TRAC_GIT: git://trac.sagemath.org/sage.git
   SAGE_TRAC_COMMAND: try
@@ -99 +99 @@
       CONFIGURE_ARGS: --enable-experimental-packages --enable-download-from-upstream-url
       SAGE_FAT_BINARY: yes
+      SAGE_LOCAL: /opt/sage-singular-${{ github.sha }}
 
     runs-on: windows-latest
@@ -143 +144 @@
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES="python38 python38-pip"
         choco install $PACKAGES --source cygwin
     - name: Update Sage packages from upstream artifact
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && ls -l upstream/ && export PATH="$(pwd)/build/bin:$PATH:/usr/local/bin:/usr/bin" && (cd upstream && bash -x update-pkgs.sh) && git diff'
-    - name: bootstrap
-      run: |
-        C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && env && ./bootstrap'
-    - name: install additional cygwin packages with choco
-      if: contains(matrix.pkgs, 'standard')
-      shell: bash {0}
-      run: |
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/*/distros/cygwin.txt)
-        choco install $PACKAGES --source cygwin
-    - name: configure
-      run: |
-        C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
-    - name: make $TARGETS
-      run: |
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && make -k -w V=0 base-toolchain && make -k -w V=1 $TARGETS'
-    - name: make $TARGETS_OPTIONAL
-      run: |
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && make -k -w V=1 $TARGETS_OPTIONAL'
+    - name: tox
+      run: |
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -185 +172 @@
     - name: Prepare sage-local artifact
       # We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
-      # We remove the local/lib64 link, which will be recreated by the next stage.
-      run: |
-        C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
+      # We remove the $SAGE_LOCAL/lib64 link, which will be recreated by the next stage.
+      run: |
+        C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f "${{ env.SAGE_LOCAL }}"/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files "${{ env.SAGE_LOCAL }}"'
       if: always()
     - uses: actions/upload-artifact@v2