Fix conflicts in workflow files

pitt-crc · Oct 13, 2023 · 4a7b889 · 4a7b889
1 parent d035717
commit 4a7b889
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 58 deletions.
diff --git a/.github/workflows/PackagePublish.yml b/.github/workflows/PackagePublish.yml
@@ -31,12 +31,9 @@ jobs:
             environment: publish-pypi
 
     steps:
-<<<<<<< HEAD
-=======
       - name: Checkout source
         uses: actions/checkout@v4
 
->>>>>>> v0.4.x
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
@@ -47,36 +44,20 @@ jobs:
         with:
           virtualenvs-create: false
 
-<<<<<<< HEAD
-      - name: Checkout source
-        uses: actions/checkout@v3
-
-      # Get the new package version from the release tag
-      # Release tags are expected to start with "refs/tags/v", so the first 11 characters are stripped
-      - name: Set package version
-        run: |
-          release_tag=${{github.ref}}
-          poetry version "${release_tag:11}"
-=======
       # Get the new package version from the release tag
       # Git release tags are expected to start with "refs/tags/v"
       - name: Set package version
         run: |
           release_tag=${{github.ref}}
           poetry version "${release_tag#refs/tags/v}"
->>>>>>> v0.4.x
 
       - name: Build package
         run: poetry build -v
 
       - name: Publish package
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-<<<<<<< HEAD
-          verbose: true
-=======
           print-hash: true
->>>>>>> v0.4.x
           repository-url: ${{ matrix.host }}
           user: ${{ secrets.REPO_USER }}
           password: ${{ secrets.REPO_PASSWORD }}
diff --git a/.github/workflows/PackageTest.yml b/.github/workflows/PackageTest.yml
@@ -4,11 +4,8 @@ on:
   workflow_dispatch:
   workflow_call:
   push:
-<<<<<<< HEAD
-=======
   schedule:
     - cron: 0 7 1,15 * *
->>>>>>> v0.4.x
 
 jobs:
   run-tests:
@@ -17,33 +14,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
-        slurm_version:
-          - 20.02.5.1
-          - 20.11.9.1
-          - 22.05.2.1
-        python_version:
-          - 3.8
-          - 3.9
-
-    container:
-      image: ghcr.io/pitt-crc/test-env:${{ matrix.slurm_version }}
-      credentials:
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    steps:
-      - name: Setup environment
-        run: /usr/local/bin/entrypoint.sh
-
-      - name: Checkout source code
-        uses: actions/checkout@v3
-
-      - name: Install poetry
-        run: |
-          pip install poetry
-          poetry env use python${{ matrix.python_version }}
-=======
         python-version: [ "3.8", "3.9", "3.10", "3.11" ]
 
     steps:
@@ -59,7 +29,6 @@ jobs:
         uses: snok/install-poetry@v1
         with:
           virtualenvs-create: false
->>>>>>> v0.4.x
 
       - name: Install dependencies
         run: poetry install --with tests
@@ -73,10 +42,6 @@ jobs:
       # Report partial coverage results to codacy for the current python version
       - name: Report partial coverage results
         if: github.event_name != 'release'
-<<<<<<< HEAD
-        shell: bash
-=======
->>>>>>> v0.4.x
         run: bash <(curl -Ls https://coverage.codacy.com/get.sh) report --partial -l Python -r coverage.xml
         env:
           CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
@@ -89,10 +54,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Finish reporting coverage
-<<<<<<< HEAD
-        shell: bash
-=======
->>>>>>> v0.4.x
         run: bash <(curl -Ls https://coverage.codacy.com/get.sh) final
         env:
           CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}