From 7eac510adf3aa9768af1a107f5bd353647b6d4b3 Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R" Date: Wed, 22 Sep 2021 16:27:02 -0600 Subject: [PATCH] simplified --- .github/workflows/cmake.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 40070755..ffcddbbc 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -121,19 +121,21 @@ jobs: install.packages("devtools") shell: Rscript {0} - - name: versioning - run: ./jenkins-dist.sh -v ${{ needs.init.outputs.VER }} -r ${{ needs.init.outputs.REL }} -d ${{ needs.init.outputs.DATE }} + run: ./jenkins-R-dist.sh -v ${{ needs.init.outputs.VER }} -r ${{ needs.init.outputs.REL }} -d ${{ needs.init.outputs.DATE }} - - name: R - run: | - cd R - mkdir -p phreeqc/man - mkdir -p phreeqc/src/phreeqcpp - mkdir -p phreeqc/R - mkdir -p phreeqc/data - echo "# Generated by roxygen2: do not edit by hand" > phreeqc/NAMESPACE - DATE=$(date -d ${{ needs.init.outputs.DATE }} "+%Y-%m-%d") - make VERSION=${{ needs.init.outputs.VER }} RELEASE_DATE=$DATE build + # - name: versioning + # run: ./jenkins-dist.sh -v ${{ needs.init.outputs.VER }} -r ${{ needs.init.outputs.REL }} -d ${{ needs.init.outputs.DATE }} + + # - name: R + # run: | + # cd R + # mkdir -p phreeqc/man + # mkdir -p phreeqc/src/phreeqcpp + # mkdir -p phreeqc/R + # mkdir -p phreeqc/data + # echo "# Generated by roxygen2: do not edit by hand" > phreeqc/NAMESPACE + # DATE=$(date -d ${{ needs.init.outputs.DATE }} "+%Y-%m-%d") + # make VERSION=${{ needs.init.outputs.VER }} RELEASE_DATE=$DATE build - uses: actions/upload-artifact@v2 with: