max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converted output to env

Browse Source
This commit is contained in:
Charlton, Scott R 2023-01-13 12:13:42 -07:00
parent 49d5fb6b00
commit 2d878752df
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
.github/workflows/cmake.yml vendored
View File

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