put workflow files back to normal

NOAA-GFDL · Nov 7, 2024 · f1b27f4 · f1b27f4
1 parent 09daa37
commit f1b27f4
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 36 deletions.
diff --git a/.github/workflows/build_conda.yml b/.github/workflows/build_conda.yml
@@ -2,8 +2,7 @@ name: build_conda
 on:
   pull_request:
     branches:
-      - FOO
-#      - main
+      - main
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/create_test_conda_env.yml b/.github/workflows/create_test_conda_env.yml
@@ -27,41 +27,41 @@ jobs:
           # add conda env's executables to github's PATH equiv.
           echo $CONDA/envs/fre-cli/bin >> $GITHUB_PATH
 
-          ## use *conda environment's pip* to install fre-cli
-          ## called w/ full path to conda's python for explicitness
-          ## called as a module (-m pip) for explicitness
+          # use *conda environment's pip* to install fre-cli
+          # called w/ full path to conda's python for explicitness
+          # called as a module (-m pip) for explicitness
           $CONDA/envs/fre-cli/bin/python -m pip install --prefix $CONDA/envs/fre-cli .
 
-#      - name: Run pytest in fre-cli environment
-#        run: |
-#          # try to make sure the right things are in GITHUB_PATH
-#          echo $CONDA/envs/fre-cli/bin >> $GITHUB_PATH
-#          
-#          # are we talking to the right python?
-#          which python
-#          python --version
-#          $CONDA/envs/fre-cli/bin/python --version
-#          
-#          # run pytest
-#          pytest --junit-xml=pytest_results.xml --config-file=fre/pytest.ini --cov-config=fre/coveragerc --cov-report=xml --cov=fre fre/
-#          
-#          # install genbadge to generate coverage badge based on xml
-#          pip install genbadge
-#          genbadge coverage -v -i coverage.xml -o docs/cov_badge.svg
-#          genbadge tests -v -i pytest_results.xml -o docs/pytest_badge.svg
-#        
-#      - name: Run pylint in fre-cli environment
-#        run: |
-#          # try to make sure the right things are in GITHUB_PATH
-#          echo $CONDA/envs/fre-cli/bin >> $GITHUB_PATH
-#
-#          # are we talking to the right python?
-#          which python
-#          python --version
-#          $CONDA/envs/fre-cli/bin/python --version
-#          
-#          # run pylint, ignored modules avoid warnings arising from code internal to those modules 
-#          pylint --max-args 6 -ry --ignored-modules netCDF4,cmor fre/ || echo "pylint returned non-zero exit code. preventing workflow from dying with this echo."
+      - name: Run pytest in fre-cli environment
+        run: |
+          # try to make sure the right things are in GITHUB_PATH
+          echo $CONDA/envs/fre-cli/bin >> $GITHUB_PATH
+          
+          # are we talking to the right python?
+          which python
+          python --version
+          $CONDA/envs/fre-cli/bin/python --version
+          
+          # run pytest
+          pytest --junit-xml=pytest_results.xml --config-file=fre/pytest.ini --cov-config=fre/coveragerc --cov-report=xml --cov=fre fre/
+          
+          # install genbadge to generate coverage badge based on xml
+          pip install genbadge
+          genbadge coverage -v -i coverage.xml -o docs/cov_badge.svg
+          genbadge tests -v -i pytest_results.xml -o docs/pytest_badge.svg
+        
+      - name: Run pylint in fre-cli environment
+        run: |
+          # try to make sure the right things are in GITHUB_PATH
+          echo $CONDA/envs/fre-cli/bin >> $GITHUB_PATH
+
+          # are we talking to the right python?
+          which python
+          python --version
+          $CONDA/envs/fre-cli/bin/python --version
+          
+          # run pylint, ignored modules avoid warnings arising from code internal to those modules 
+          pylint --max-args 6 -ry --ignored-modules netCDF4,cmor fre/ || echo "pylint returned non-zero exit code. preventing workflow from dying with this echo."
 
       - name: Install Sphinx and Build Documentation
         run: |
@@ -72,7 +72,7 @@ jobs:
 
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
-#        if: ${{ github.ref == 'refs/heads/main' }}
+        if: ${{ github.ref == 'refs/heads/main' }}
         with:
           publish_branch: gh-pages
           github_token: ${{ secrets.GITHUB_TOKEN }}