@@ -226,13 +226,13 @@ jobs:
226226 echo -e "Status\t[ \033[32;2;1mOK\033[0m ]"
227227 fi
228228
229- # # Upload artifact (since V4 we can't upload artifact using the same name, each one must be unique)
230- # - name: Upload built artifacts
231- # uses: actions/upload-artifact@v4
232- # with:
233- # name: bins-${{ matrix.os }}-${{ matrix.precision }}-${{ matrix.build }}
234- # path: ${{ env.WORKDIR }}/exec
235- # if: ${{ env.CLOSE_BRANCH == 0 }}
229+ # Upload artifact (since V4 we can't upload artifact using the same name, each one must be unique)
230+ - name: Upload built artifacts
231+ uses: actions/upload-artifact@v4
232+ with:
233+ name: bins-${{ matrix.os }}-${{ matrix.precision }}-${{ matrix.build }}
234+ path: ${{ env.WORKDIR }}/exec
235+ if: ${{ env.CLOSE_BRANCH == 0 }}
236236
237237 # We upload extlib only once, arbitrary choice
238238 - name: Upload extlib artifacts
@@ -445,190 +445,190 @@ jobs:
445445 # exit 1
446446 # if: ${{ always() && env.CLOSE_BRANCH == 1 && steps.close_branch_build.outputs.status != 200 }}
447447
448- delivery:
449- # needs: [build_linux,build_windows_no_container]
450- needs: [build_linux]
451- # DEV ONLY # runs-on: dev_delivery
452- runs-on: delivery
453- container:
454- image: fr-qafactorydev.europe.altair.com/common-linux64
455- credentials:
456- username: ${{secrets.DOCKER_REGISTRY_USER}}
457- password: ${{secrets.DOCKER_REGISTRY_PASSWD}}
458- volumes:
459- - /etc/localtime:/etc/localtime:ro
460- # DEV ONLY # - /github_download_counter_dev:/github_download_counter
461- - /github_download_counter:/github_download_counter
448+ # delivery:
449+ # # needs: [build_linux,build_windows_no_container]
450+ # needs: [build_linux]
451+ # # DEV ONLY # runs-on: dev_delivery
452+ # runs-on: delivery
453+ # container:
454+ # image: fr-qafactorydev.europe.altair.com/common-linux64
455+ # credentials:
456+ # username: ${{secrets.DOCKER_REGISTRY_USER}}
457+ # password: ${{secrets.DOCKER_REGISTRY_PASSWD}}
458+ # volumes:
459+ # - /etc/localtime:/etc/localtime:ro
460+ # # DEV ONLY # - /github_download_counter_dev:/github_download_counter
461+ # - /github_download_counter:/github_download_counter
462462
463- env:
464- SERVBOT_USER: ${{ secrets.SERVBOT_USER }}
465- SERVBOT_PAT: ${{ secrets.SERVBOT_PAT }}
466- DELIVERY_NB_RELEASES_TO_KEEP: 3
467- DELIVERY_TAG_PREFIX: 'latest-'
468- OPENRADIOSS_MAINDIR_NAME: 'OpenRadioss'
469- OPENRADIOSS_GUI: 'openradioss_gui'
470- TOOLS_OPENRADIOSS_GUI: 'TOOLS/openradioss_gui'
471- TOOLS_INP2RAD: 'TOOLS/input_converters/inp2rad/inp2rad/inp2rad.py'
472- CI: 'true' # if true, disables interactive prompts and progress bar
473- JFROG_CLI_AVOID_NEW_VERSION_WARNING: "true"
474- JFROG_CLI_LOG_LEVEL: "ERROR"
475- JF_OPTIONS: "--url=${{ secrets.JFROG_DELIVERY_URL }} --user=${{ secrets.JFROG_DELIVERY_USER }} --password=${{ secrets.JFROG_DELIVERY_TOKEN }}"
476- JF_TOOLS_OUTPUT_CONVERTERS: "${{ secrets.JFROG_DELIVERY_RADIOSS_REPO }}/OpenRadioss_Tools/output_converters"
463+ # env:
464+ # SERVBOT_USER: ${{ secrets.SERVBOT_USER }}
465+ # SERVBOT_PAT: ${{ secrets.SERVBOT_PAT }}
466+ # DELIVERY_NB_RELEASES_TO_KEEP: 3
467+ # DELIVERY_TAG_PREFIX: 'latest-'
468+ # OPENRADIOSS_MAINDIR_NAME: 'OpenRadioss'
469+ # OPENRADIOSS_GUI: 'openradioss_gui'
470+ # TOOLS_OPENRADIOSS_GUI: 'TOOLS/openradioss_gui'
471+ # TOOLS_INP2RAD: 'TOOLS/input_converters/inp2rad/inp2rad/inp2rad.py'
472+ # CI: 'true' # if true, disables interactive prompts and progress bar
473+ # JFROG_CLI_AVOID_NEW_VERSION_WARNING: "true"
474+ # JFROG_CLI_LOG_LEVEL: "ERROR"
475+ # JF_OPTIONS: "--url=${{ secrets.JFROG_DELIVERY_URL }} --user=${{ secrets.JFROG_DELIVERY_USER }} --password=${{ secrets.JFROG_DELIVERY_TOKEN }}"
476+ # JF_TOOLS_OUTPUT_CONVERTERS: "${{ secrets.JFROG_DELIVERY_RADIOSS_REPO }}/OpenRadioss_Tools/output_converters"
477477
478- steps:
478+ # steps:
479479
480- # Set the working dir suffixed with deliv_stable
481- - name: Set workdir
482- run: |
483- echo "WORKDIR=deliv_stable" >> $GITHUB_ENV
480+ # # Set the working dir suffixed with deliv_stable
481+ # - name: Set workdir
482+ # run: |
483+ # echo "WORKDIR=deliv_stable" >> $GITHUB_ENV
484484
485- - name: Create branch oriented WS directory & integration WS
486- run: |
487- mkdir -p ${{ env.WORKDIR }}
485+ # - name: Create branch oriented WS directory & integration WS
486+ # run: |
487+ # mkdir -p ${{ env.WORKDIR }}
488488
489- - name: Set the release name & clean previous exec
490- working-directory: ${{ env.WORKDIR }}
491- run: |
492- echo "DATEOFTHETAG=${LAST_STABLE_TAG_NAME#latest-}" >> $GITHUB_ENV
493- rm -rf exec todeliver exec_tmp
489+ # - name: Set the release name & clean previous exec
490+ # working-directory: ${{ env.WORKDIR }}
491+ # run: |
492+ # echo "DATEOFTHETAG=${LAST_STABLE_TAG_NAME#latest-}" >> $GITHUB_ENV
493+ # rm -rf exec todeliver exec_tmp
494494
495- # Get last git modifications, don't clean before (way to go faster)
496- - name: Checkout git sources
497- uses: actions/checkout@v4
498- with:
499- path: ${{ env.WORKDIR }}
500- lfs: 'true'
501- ref: ${{ env.LAST_STABLE_TAG_NAME }}
495+ # # Get last git modifications, don't clean before (way to go faster)
496+ # - name: Checkout git sources
497+ # uses: actions/checkout@v4
498+ # with:
499+ # path: ${{ env.WORKDIR }}
500+ # lfs: 'true'
501+ # ref: ${{ env.LAST_STABLE_TAG_NAME }}
502502
503- # Get OpenRadioss extras from dedicated repository
504- - name: Checkout git EXTRA sources
505- uses: actions/checkout@v4
506- with:
507- lfs: 'true'
508- clean: 'false'
509- repository: '${{ secrets.EXTRA_REPOSITORY }}'
510- path: "${{ env.WORKDIR }}/EXTRA"
511- token: '${{ secrets.EXTRA_REPOSITORY_PAT }}'
503+ # # Get OpenRadioss extras from dedicated repository
504+ # - name: Checkout git EXTRA sources
505+ # uses: actions/checkout@v4
506+ # with:
507+ # lfs: 'true'
508+ # clean: 'false'
509+ # repository: '${{ secrets.EXTRA_REPOSITORY }}'
510+ # path: "${{ env.WORKDIR }}/EXTRA"
511+ # token: '${{ secrets.EXTRA_REPOSITORY_PAT }}'
512512
513- # Get OpenRadioss gui in Tools repository
514- - name: Checkout git Tools sources
515- uses: actions/checkout@v4
516- with:
517- lfs: 'true'
518- clean: 'false'
519- repository: '${{ secrets.TOOLS_REPOSITORY }}'
520- path: "${{ env.WORKDIR }}/TOOLS"
521- token: '${{ secrets.EXTRA_REPOSITORY_PAT }}'
513+ # # Get OpenRadioss gui in Tools repository
514+ # - name: Checkout git Tools sources
515+ # uses: actions/checkout@v4
516+ # with:
517+ # lfs: 'true'
518+ # clean: 'false'
519+ # repository: '${{ secrets.TOOLS_REPOSITORY }}'
520+ # path: "${{ env.WORKDIR }}/TOOLS"
521+ # token: '${{ secrets.EXTRA_REPOSITORY_PAT }}'
522522
523- # Download ALL artifacts (including extlib.zip)
524- - name: Download ALL artifacts for packaging
525- uses: actions/download-artifact@v4
526- with:
527- merge-multiple: true
528- path: "${{ env.WORKDIR }}/exec_tmp"
523+ # # Download ALL artifacts (including extlib.zip)
524+ # - name: Download ALL artifacts for packaging
525+ # uses: actions/download-artifact@v4
526+ # with:
527+ # merge-multiple: true
528+ # path: "${{ env.WORKDIR }}/exec_tmp"
529529
530- - name: Check files in exec
531- working-directory: ${{ env.WORKDIR }}
532- run: |
533- # DEV ONLY #
534- mkdir -p exec_tmp
535- touch exec_tmp/starter_linux64_gf
536- touch exec_tmp/starter_linux64_gf_sp
537- touch exec_tmp/engine_linux64_gf_ompi
538- touch exec_tmp/engine_linux64_gf
539- touch exec_tmp/engine_linux64_gf_ompi_sp
540- touch exec_tmp/engine_linux64_gf_sp
541- touch exec_tmp/starter_linuxa64
542- touch exec_tmp/starter_linuxa64_sp
543- touch exec_tmp/engine_linuxa64
544- touch exec_tmp/engine_linuxa64_sp
545- touch exec_tmp/engine_linuxa64_ompi
546- touch exec_tmp/engine_linuxa64_ompi_sp
547- touch exec_tmp/starter_win64
548- touch exec_tmp/starter_win64_sp
549- touch exec_tmp/engine_win64_impi
550- touch exec_tmp/engine_win64_impi_sp
551- touch exec_tmp/engine_win64
552- touch exec_tmp/engine_win64_sp
553- cd exec_tmp/
554- cd ..
555- ls -l exec_tmp/
530+ # - name: Check files in exec
531+ # working-directory: ${{ env.WORKDIR }}
532+ # run: |
533+ # # DEV ONLY #
534+ # mkdir -p exec_tmp
535+ # touch exec_tmp/starter_linux64_gf
536+ # touch exec_tmp/starter_linux64_gf_sp
537+ # touch exec_tmp/engine_linux64_gf_ompi
538+ # touch exec_tmp/engine_linux64_gf
539+ # touch exec_tmp/engine_linux64_gf_ompi_sp
540+ # touch exec_tmp/engine_linux64_gf_sp
541+ # touch exec_tmp/starter_linuxa64
542+ # touch exec_tmp/starter_linuxa64_sp
543+ # touch exec_tmp/engine_linuxa64
544+ # touch exec_tmp/engine_linuxa64_sp
545+ # touch exec_tmp/engine_linuxa64_ompi
546+ # touch exec_tmp/engine_linuxa64_ompi_sp
547+ # touch exec_tmp/starter_win64
548+ # touch exec_tmp/starter_win64_sp
549+ # touch exec_tmp/engine_win64_impi
550+ # touch exec_tmp/engine_win64_impi_sp
551+ # touch exec_tmp/engine_win64
552+ # touch exec_tmp/engine_win64_sp
553+ # cd exec_tmp/
554+ # cd ..
555+ # ls -l exec_tmp/
556556
557- - name: Copy all artifact complex structure into flat files in exec
558- working-directory: ${{ env.WORKDIR }}
559- run: |
560- echo "List exec_tmp : "
561- find exec_tmp -type f
557+ # - name: Copy all artifact complex structure into flat files in exec
558+ # working-directory: ${{ env.WORKDIR }}
559+ # run: |
560+ # echo "List exec_tmp : "
561+ # find exec_tmp -type f
562562
563- # mv exec_tmp/extlib.zip ./
563+ # # mv exec_tmp/extlib.zip ./
564564
565- for os in linux64 linuxa64 win64
566- do
567- mkdir -p exec/${os}
568- cp -p exec_tmp/*${os}* exec/${os}/
569- chmod 755 exec/${os}/*
570- done
565+ # for os in linux64 linuxa64 win64
566+ # do
567+ # mkdir -p exec/${os}
568+ # cp -p exec_tmp/*${os}* exec/${os}/
569+ # chmod 755 exec/${os}/*
570+ # done
571571
572- echo "List exec : "
573- find exec -type f
572+ # echo "List exec : "
573+ # find exec -type f
574574
575- # - name: Unzip extlib
576- # working-directory: ${{ env.WORKDIR }}
577- # run: |
578- # unzip extlib.zip
575+ # # - name: Unzip extlib
576+ # # working-directory: ${{ env.WORKDIR }}
577+ # # run: |
578+ # # unzip extlib.zip
579579
580- - name: Provide ALL binaries
581- working-directory: ${{ env.WORKDIR }}
582- run: |
583- # Removed lfs hook (not supported in next action, not neeeded)
584- rm -f .git/hooks/pre-push
585-
586- # Prepare tree architecture
587- rm -rf todeliver
588-
589- for os in linux64 linuxa64 win64
590- do
591- mkdir -p todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/extlib/h3d/lib/${os} todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/extlib/hm_reader todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/exec
592- # cp -a extlib/h3d/lib/${os}/* todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/extlib/h3d/lib/${os}/
593- # cp -a extlib/hm_reader/${os} todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/extlib/hm_reader/
594-
595- # Get Intel runtime and some other extras from a dedicated repository
596- if test -d EXTRA/${os}
597- then
598- cp -a EXTRA/${os}/* todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/
599- fi
600-
601- # Get OpenRadioss gui from Tools repository and inp2rad
602- if test -d ${{ env.TOOLS_OPENRADIOSS_GUI}}
603- then
604- cp -a ${{ env.TOOLS_OPENRADIOSS_GUI}} todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/
605- if test -f ${{ env.TOOLS_INP2RAD}}
606- then
607- cp -a ${{ env.TOOLS_INP2RAD}} todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/${{ env.OPENRADIOSS_GUI }}/
608- fi
609- fi
610-
611- # Get some output converters from Tools repository
612- jf rt download ${JF_OPTIONS} "${JF_TOOLS_OUTPUT_CONVERTERS}/${os}/*" todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/exec/ --flat=true
613- chmod 755 todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/exec/*
614-
615- cp -a hm_cfg_files todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/
616-
617- cp -a exec/${os}/* todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/exec/
618-
619- mkdir -p todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/licenses
620- # cp -a extlib/license/* todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/licenses/
621-
622- cp -a COPYRIGHT.md todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/
623-
624- export OPENRADIOSS_BIN_ARCHIVE="${{ env.OPENRADIOSS_MAINDIR_NAME }}_${os}.zip"
625-
626- cd todeliver/${os}
627- # zip -r ../$OPENRADIOSS_BIN_ARCHIVE ${{ env.OPENRADIOSS_MAINDIR_NAME }}
628- cd ..
629- rm -rf ${os}
630- cd ..
631- done
580+ # - name: Provide ALL binaries
581+ # working-directory: ${{ env.WORKDIR }}
582+ # run: |
583+ # # Removed lfs hook (not supported in next action, not neeeded)
584+ # rm -f .git/hooks/pre-push
585+
586+ # # Prepare tree architecture
587+ # rm -rf todeliver
588+
589+ # for os in linux64 linuxa64 win64
590+ # do
591+ # mkdir -p todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/extlib/h3d/lib/${os} todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/extlib/hm_reader todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/exec
592+ # # cp -a extlib/h3d/lib/${os}/* todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/extlib/h3d/lib/${os}/
593+ # # cp -a extlib/hm_reader/${os} todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/extlib/hm_reader/
594+
595+ # # Get Intel runtime and some other extras from a dedicated repository
596+ # if test -d EXTRA/${os}
597+ # then
598+ # cp -a EXTRA/${os}/* todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/
599+ # fi
600+
601+ # # Get OpenRadioss gui from Tools repository and inp2rad
602+ # if test -d ${{ env.TOOLS_OPENRADIOSS_GUI}}
603+ # then
604+ # cp -a ${{ env.TOOLS_OPENRADIOSS_GUI}} todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/
605+ # if test -f ${{ env.TOOLS_INP2RAD}}
606+ # then
607+ # cp -a ${{ env.TOOLS_INP2RAD}} todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/${{ env.OPENRADIOSS_GUI }}/
608+ # fi
609+ # fi
610+
611+ # # Get some output converters from Tools repository
612+ # jf rt download ${JF_OPTIONS} "${JF_TOOLS_OUTPUT_CONVERTERS}/${os}/*" todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/exec/ --flat=true
613+ # chmod 755 todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/exec/*
614+
615+ # cp -a hm_cfg_files todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/
616+
617+ # cp -a exec/${os}/* todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/exec/
618+
619+ # mkdir -p todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/licenses
620+ # # cp -a extlib/license/* todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/licenses/
621+
622+ # cp -a COPYRIGHT.md todeliver/${os}/${{ env.OPENRADIOSS_MAINDIR_NAME }}/
623+
624+ # export OPENRADIOSS_BIN_ARCHIVE="${{ env.OPENRADIOSS_MAINDIR_NAME }}_${os}.zip"
625+
626+ # cd todeliver/${os}
627+ # # zip -r ../$OPENRADIOSS_BIN_ARCHIVE ${{ env.OPENRADIOSS_MAINDIR_NAME }}
628+ # cd ..
629+ # rm -rf ${os}
630+ # cd ..
631+ # done
632632
633633 # - name: Set some variables
634634 # working-directory: ${{ env.WORKDIR }}
0 commit comments