From 2de236b927f6769bc860cd97a8f4e73773ebe80b Mon Sep 17 00:00:00 2001 From: Henry Senyondo Date: Tue, 5 Nov 2024 02:45:39 -0500 Subject: [PATCH 1/2] Avoid stashing Force the repos to be clean of changes --- archive_predictions.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/archive_predictions.sh b/archive_predictions.sh index 218cf33..e1a7339 100644 --- a/archive_predictions.sh +++ b/archive_predictions.sh @@ -6,10 +6,10 @@ date=$(date '+%Y-%m-%d %H:%M:%S') # Change directory to the everwatch-predictions cd /blue/ewhite/everglades/everwatch-predictions || exit -# Stash any local changes, switch to the main branch, and pull the latest updates -git stash +git reset --hard git checkout main -git pull origin main +git fetch origin main +git reset --hard origin/main # Set up the user information for Weecology Deploy Bot git config user.email "weecologydeploy@weecology.org" @@ -39,12 +39,6 @@ cp /blue/ewhite/everglades/everwatch-workflow/App/Zooniverse/data/PredictedBirds git add PredictedBirds.zip PredictedBirds.csv git commit -m "Weecology Deploy Bot $date" -# Uncomment the following line if you intend to push directly to the main branch -# git push origin main - -# Reapply stashed changes, if any -git stash pop || echo "No stashed changes to apply." - # Set up the deploy remote for the portal-forecasts repository git remote remove deploy git remote add deploy https://${GITHUBTOKEN}@github.com/weecology/everwatch-predictions.git From 0199fe2612f1a171ace8cfea08f9ad1834f98e80 Mon Sep 17 00:00:00 2001 From: Henry Senyondo Date: Tue, 5 Nov 2024 02:58:34 -0500 Subject: [PATCH 2/2] Repair mamba-org micromamba action --- .github/workflows/python-package-conda.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 2366cbe..0249253 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -1,4 +1,4 @@ -name: YAPF Google chromium style +name: YAPF Style Check on: push: @@ -14,7 +14,8 @@ jobs: fail-fast: false matrix: python-version: - - 3.9 + - "3.12" + os: - "ubuntu-latest" @@ -26,15 +27,22 @@ jobs: shell: "bash -l {0}" steps: - - uses: actions/checkout@v3 - - uses: mamba-org/provision-with-micromamba@v15 + - name: "Checkout code" + uses: "actions/checkout@v4" + + - name: Install opencv dependencies + run: | + sudo apt-get update + sudo apt-get install -y libgl1-mesa-glx libegl1-mesa + + - name: Install Conda environment with Micromamba + uses: mamba-org/setup-micromamba@v1 with: environment-name: Zooniverse environment-file: dev_environment.yml - python-version: "${{ matrix.python-version }}" cache-env: true cache-downloads: true - - name: "Run tests" + - name: Run YAPF code style check run: | yapf -d ./*.py --style=.style.yapf 2>&1