refactor

.github/workflows/release.yml

@@ -32,66 +32,26 @@ jobs:
         fileName: "*w64-msvc17*.zip"
         out-file-path: "fireanalyticstoolbox/cbc"
         extract: true
-
-          # - name: CheckoutC2F-W
-          #   uses: actions/checkout@master
-          #   with:
-          #     repository: "fire2a/C2F-W" 
-          #     path: "fireanalyticstoolbox/simulator/C2F"
-          #     sparse-checkout: |
-          #       Cell2Fire/Cell2Fire.exe
-          #       Cell2Fire/Cell2Fire.Linux.x86_64
-          #       Cell2Fire/Cell2Fire.Darwin.x86_64
-          #       Cell2Fire/Cell2Fire.Darwin.arm64
-          #       Cell2Fire/cell2fire.py
-          #       Cell2Fire/DataGeneratorC.py
-          #     sparse-checkout-cone-mode: false
-
-          # - name: CheckoutFire2a-lib
-          #   uses: actions/checkout@master
-          #   with:
-          #     repository: "fire2a/fire2a-lib" 
-          #     path: "fireanalyticstoolbox/fire2a"
-          #     sparse-checkout: |
-          #       src/fire2a/*.py
-          #     sparse-checkout-cone-mode: false
+        tarBall: false
+        zipBall: false
 
     - name: download cell2fire
-      uses: robinraju/release-downloader@v1.8
+      uses: robinraju/release-downloader@v1.11
       with:
         repository: "fire2a/C2F-W" 
         latest: true
-        fileName: "*.zip"
-        out-file-path: "fireanalyticstoolbox/simulator/tmp"
+        fileName: " Cell2FireW_v*.*.*.zip"
+        out-file-path: "fireanalyticstoolbox/simulator"
         extract: true
         tarBall: false
         zipBall: false
 
     - name: git archive
       run: |
-         rm fireanalyticstoolbox/cbc/*w64-msvc17*.zip
-
-         mkdir  fireanalyticstoolbox/simulator/C2F
-         mv fireanalyticstoolbox/simulator/tmp/C2F/Cell2Fire fireanalyticstoolbox/simulator/tmp/C2F/LICENSE fireanalyticstoolbox/simulator/tmp/C2F/README.md fireanalyticstoolbox/simulator/C2F
-         rm -rf fireanalyticstoolbox/simulator/tmp
-         rm -f fireanalyticstoolbox/simulator/C2F/Cell2Fire/makefile*
-         rm -f fireanalyticstoolbox/simulator/C2F/Cell2Fire/*cpp
-         rm -f fireanalyticstoolbox/simulator/C2F/Cell2Fire/*h
-         rm -f fireanalyticstoolbox/simulator/C2F/Cell2Fire/*sln
-         rm -f fireanalyticstoolbox/simulator/C2F/Cell2Fire/*vcxproj*
-
-         # mv fireanalyticstoolbox/fire2a/src/fire2a/* fireanalyticstoolbox/fire2a
-         # rm -rf fireanalyticstoolbox/fire2a/.git* fireanalyticstoolbox/fire2a/src
-         # grep -Rl --include=*py "from fire2a" | tee will.change | xargs -I {} sed -i "s/^from fire2a/from .fire2a/" {}
-         # cat will.change 
-         # rm will.change
-
          git add fireanalyticstoolbox/cbc
          git add fireanalyticstoolbox/simulator/C2F
-         # git add fireanalyticstoolbox/fire2a
-         lestash=`git stash create`
-
-         git archive --output "fireanalyticstoolbox_${{ github.ref_name }}.zip" $lestash fireanalyticstoolbox
+         astash=`git stash create`
+         git archive --output "fireanalyticstoolbox_${{ github.ref_name }}.zip" $astash fireanalyticstoolbox
 
     - name: Create Release
       uses: ncipollo/[email protected]