resolving merge conflict

.github/workflows/cellphonedb-v3.1.0.yml

@@ -5,25 +5,14 @@ on:
     branches:
       - prod
     paths:
-<<<<<<<< HEAD:.github/workflows/ibdgc-db-env.yml
-      - 'builds/ibdgc-db-env/v1/**'
+      - "tools/cellphoneDB/v3.1.0/**"
 
 env:
-  AWS_REGION: us-east-1                   # set this to your preferred AWS region, e.g. us-west-1
-  REGISTRY_ALIAS: chobiolab               # aws ecr public alias
-  VER:                                    # version of coreSC
-  REPOSITORY: ibdgc-db-env                      # aws ecr repo path
-  BUILD_PATH: builds/ibdgc-db-env/v1          # dir location of build files in repo
-========
-      - 'tools/cellphoneDB/v3.1.0/**'
-
-env:
-  AWS_REGION: us-east-1                   # set this to your preferred AWS region, e.g. us-west-1
-  REGISTRY_ALIAS: chobiolab                # aws ecr public alias
-  REPOSITORY: cellphonedb      # aws ecr repo path
-  VER: 3.1.0                         # version
-  BUILD_PATH: tools/cellphoneDB/v3.1.0                 # dir location of build files in repo
->>>>>>>> main:.github/workflows/cellphonedb-v3.1.0.yml
+  AWS_REGION: us-east-1 # set this to your preferred AWS region, e.g. us-west-1
+  REGISTRY_ALIAS: chobiolab # aws ecr public alias
+  REPOSITORY: cellphonedb # aws ecr repo path
+  VER: 3.1.0 # version
+  BUILD_PATH: tools/cellphoneDB/v3.1.0 # dir location of build files in repo
 
 permissions:
   contents: read
@@ -35,33 +24,33 @@ jobs:
     environment: production
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: ${{ env.AWS_REGION }}
-
-    - name: Login to Amazon ECR
-      id: login-ecr
-      uses: aws-actions/amazon-ecr-login@v1
-
-    - name: Login to Amazon ECR Public
-      id: login-ecr-public
-      uses: aws-actions/amazon-ecr-login@v1
-      with:
-        registry-type: public
-
-    # added this line to shorten the SHA tag
-    - name: Add SHORT_SHA env property with commit short sha
-      run: echo "SHORT_SHA=`echo ${{ github.sha }} | cut -c1-7`" >> $GITHUB_ENV
-
-    - name: Build, tag, and push docker image to Amazon ECR Public
-      env:
-        REGISTRY: ${{ steps.login-ecr-public.outputs.registry }}
-      run: |
-        docker build -t $REGISTRY/$REGISTRY_ALIAS/$REPOSITORY:$VER $BUILD_PATH
-        docker push $REGISTRY/$REGISTRY_ALIAS/$REPOSITORY:$VER
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Login to Amazon ECR Public
+        id: login-ecr-public
+        uses: aws-actions/amazon-ecr-login@v1
+        with:
+          registry-type: public
+
+      # added this line to shorten the SHA tag
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${{ github.sha }} | cut -c1-7`" >> $GITHUB_ENV
+
+      - name: Build, tag, and push docker image to Amazon ECR Public
+        env:
+          REGISTRY: ${{ steps.login-ecr-public.outputs.registry }}
+        run: |
+          docker build -t $REGISTRY/$REGISTRY_ALIAS/$REPOSITORY:$VER $BUILD_PATH
+          docker push $REGISTRY/$REGISTRY_ALIAS/$REPOSITORY:$VER