cleaning, restoring, pointing to correct place

OpenSmalltalk · Apr 6, 2017 · e3be54b · e3be54b
1 parent 0721ab7
commit e3be54b
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 13 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -3,11 +3,51 @@ environment:
   BINTRAYAPIKEY:
     secure: uknPzww818XWJiLecwur9p1MfrkACOyx9d3iNrw/TuD89EoPSc8zLqKdPZjWdcQd
   matrix:
+    - FLAVOR: squeak.sista.spur
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
+    - FLAVOR: squeak.cog.spur
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
+    - FLAVOR: squeak.cog.v3
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
+    - FLAVOR: squeak.stack.spur
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
+    - FLAVOR: squeak.stack.v3
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: pharo.cog.spur
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
+    - FLAVOR: newspeak.cog.spur
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
+    - FLAVOR: newspeak.stack.spur
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
+    - FLAVOR: squeak.stack.spur
+      ARCH: win64x64
+      CYG_ROOT: C:\cygwin64
+      CYG_SETUP: setup-x86_64.exe
+      MINGW_ARCH: x86_64
     - FLAVOR: pharo.stack.spur
       ARCH: win64x64
       CYG_ROOT: C:\cygwin64
@@ -41,9 +81,9 @@ build: false
 # default file handles. Ensure a dummy file descriptor is opened with 'exec'.
 test_script:
   - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./.travis_build.sh"'
-#on_success:
-#  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./.travis_deploy.sh"'
+on_success:
+  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./.travis_deploy.sh"'
 before_deploy:
   - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/deploy/pharo; exec 0</dev/null; exec ./filter-exec.sh pack-vm.sh; exec filter-exec.sh deploy-key.sh"'
 deploy_script:
-  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./deploy/pharo/filter-exec.sh deploy-files.pharo.org.sh"'
+  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./deploy/pharo/filter-exec.sh deploy-files.pharo.org.sh"'
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ matrix:
       script: ./deploy/pharo/deploy-files.pharo.org.sh
       on:
         branch: Cog
-        repo: estebanlm/opensmalltalk-vm
+        repo: OpenSmalltalk/opensmalltalk-vm
   - os: linux
     env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
     before_deploy: (cd deploy/pharo && ./pack-vm.sh && ./deploy-key.sh)
@@ -36,7 +36,7 @@ matrix:
       script: ./deploy/pharo/deploy-files.pharo.org.sh
       on:
         branch: Cog
-        repo: estebanlm/opensmalltalk-vm
+        repo: OpenSmalltalk/opensmalltalk-vm
   - os: linux
     env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
   - os: linux
@@ -60,7 +60,7 @@ matrix:
       script: ./deploy/pharo/deploy-files.pharo.org.sh
       on:
         branch: Cog
-        repo: estebanlm/opensmalltalk-vm
+        repo: OpenSmalltalk/opensmalltalk-vm
   - os: linux
     env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
     before_deploy: (cd deploy/pharo && ./pack-vm.sh && ./deploy-key.sh)
@@ -70,7 +70,7 @@ matrix:
       script: ./deploy/pharo/deploy-files.pharo.org.sh
       on:
         branch: Cog
-        repo: estebanlm/opensmalltalk-vm
+        repo: OpenSmalltalk/opensmalltalk-vm
   - os: osx
     env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
   - os: osx
@@ -84,7 +84,7 @@ matrix:
       script: ./deploy/pharo/deploy-files.pharo.org.sh
       on:
         branch: Cog
-        repo: estebanlm/opensmalltalk-vm
+        repo: OpenSmalltalk/opensmalltalk-vm
   - os: osx
     env: ARCH="macos64x64" FLAVOR="pharo.stack.spur"
   - os: osx
@@ -108,7 +108,7 @@ matrix:
       script: ./deploy/pharo/deploy-files.pharo.org.sh
       on:
         branch: Cog
-        repo: estebanlm/opensmalltalk-vm
+        repo: OpenSmalltalk/opensmalltalk-vm
   - os: osx
     env: ARCH="macos32x86" FLAVOR="pharo.stack.spur"
   - os: osx
@@ -152,7 +152,7 @@ matrix:
       script: ./deploy/pharo/deploy-files.pharo.org.sh
       on:
         branch: Cog
-        repo: estebanlm/opensmalltalk-vm
+        repo: OpenSmalltalk/opensmalltalk-vm
   - os: linux
     env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi
       -- bash -c "
@@ -170,5 +170,5 @@ script:
 - cd ../../../
 - $CHROOT ./.travis_build.sh
 - ./.travis_test.sh
-#after_success:
-#- ./.travis_deploy.sh
+after_success:
+- ./.travis_deploy.sh
diff --git a/deploy/pharo/filter-exec.sh b/deploy/pharo/filter-exec.sh
@@ -8,7 +8,7 @@ if [[ "$FLAVOR" != *pharo* ]]; then
 	exit 
 fi
 
-if [ "$APPVEYOR_REPO_NAME" != "estebanlm/opensmalltalk-vm" ]; then
+if [ "$APPVEYOR_REPO_NAME" != "OpenSmalltalk/opensmalltalk-vm" ]; then
 	echo "Trying to deploy in repository: $APPVEYOR_REPO_NAME. Skipping."
 	exit 
 fi