diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 999967a7..6893f901 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -15,17 +15,23 @@ jobs: init: runs-on: ubuntu-latest # Map step outputs to job outputs - outputs: - VER: ${{ steps.vars.outputs.VER }} - REL: ${{ steps.vars.outputs.REL }} - DATE: ${{ steps.vars.outputs.DATE }} + # outputs: + # VER: ${{ steps.vars.outputs.VER }} + # REL: ${{ steps.vars.outputs.REL }} + # DATE: ${{ steps.vars.outputs.DATE }} + # steps: + # - name: Setup vars + # id: vars + # run: | + # echo ::set-output name=VER::$(curl -sS https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/next_ver.sh | sh) + # echo ::set-output name=REL::$(curl -sS https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/rel.py | python3) + # echo ::set-output name=DATE::$(date "+%x") steps: - name: Setup vars - id: vars run: | - echo ::set-output name=VER::$(curl -sS https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/next_ver.sh | sh) - echo ::set-output name=REL::$(curl -sS https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/rel.py | python3) - echo ::set-output name=DATE::$(date "+%x") + echo VER=$(curl -sS https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/next_ver.sh | sh) >> $GITHUB_ENV + echo REL=$(curl -sS https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/rel.py | python3) >> $GITHUB_ENV + echo DATE=$(date "+%x") >> $GITHUB_ENV # chm: @@ -81,15 +87,15 @@ jobs: # path: ${{github.workspace}}/phreeqc3.chm - # check: - # needs: [init] - # runs-on: windows-2019 - # steps: - # - name: Display vars - # run: | - # echo VER=${{ needs.init.outputs.VER }} - # echo REL=${{ needs.init.outputs.REL }} - # echo DATE=${{ needs.init.outputs.DATE }} + check: + needs: [init] + runs-on: windows-2019 + steps: + - name: Display vars + run: | + echo VER=${{ env.VER }} + echo REL=${{ env.REL }} + echo DATE=${{ env.DATE }} r-build: needs: [init] @@ -98,7 +104,7 @@ jobs: - uses: actions/checkout@v3 - name: versioning - run: ./jenkins-dist.sh -v ${{ needs.init.outputs.VER }} -r ${{ needs.init.outputs.REL }} -d ${{ needs.init.outputs.DATE }} + run: ./jenkins-dist.sh -v ${{ env.VER }} -r ${{ env.REL }} -d ${{ env.DATE }} - name: Setup R uses: r-lib/actions/setup-r@v2 @@ -107,7 +113,7 @@ jobs: - name: create source working-directory: R - run: make VERSION=${VER} RELEASE_DATE=${DATE} source + run: make VERSION=${{ env.VER }} RELEASE_DATE=${{ env.DATE }} source - name: Install dependencies uses: r-lib/actions/setup-r-dependencies@v2 @@ -139,7 +145,7 @@ jobs: # run: Rscript -e 'install.packages("curl")' # - name: versioning - # run: ./jenkins-dist.sh -v ${{ needs.init.outputs.VER }} -r ${{ needs.init.outputs.REL }} -d ${{ needs.init.outputs.DATE }} + # run: ./jenkins-dist.sh -v ${{ env.VER }} -r ${{ env.REL }} -d ${{ env.DATE }} # - name: setup clang # run: | @@ -148,7 +154,7 @@ jobs: # echo CXX=clang++ -Qunused-arguments >> ~/.R/Makevars # - name: check - # run: cd R && make VERSION=${{ needs.init.outputs.VER }} check_built + # run: cd R && make VERSION=${{ env.VER }} check_built # - uses: actions/upload-artifact@v3 # with: @@ -214,7 +220,7 @@ jobs: # run: mv phreeqc3.chm doc/. # - name: versioning - # run: ./jenkins-dist.sh -v ${{ needs.init.outputs.VER }} -r ${{ needs.init.outputs.REL }} -d ${{ needs.init.outputs.DATE }} + # run: ./jenkins-dist.sh -v ${{ env.VER }} -r ${{ env.REL }} -d ${{ env.DATE }} # - name: doxygen # run: sudo apt-get install -y doxygen && cd doc && doxygen