ci: fix yml

hyoklee · Mar 1, 2024 · aabfa38 · aabfa38
1 parent 232b3b9
commit aabfa38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/arm64.yml b/.github/workflows/arm64.yml
@@ -24,20 +24,15 @@ jobs:
         uses: cross-platform-actions/[email protected]
         env:
           FOO: A
-          BAR: B        
+          BAR: B
         with:
-          environment_variables: FOO BAR        
+          environment_variables: FOO BAR
           operating_system: ${{ matrix.os.name }}
           architecture: ${{ matrix.os.architecture }}
           version: '${{ matrix.os.version }}'
-          shell: bash          
+          shell: bash
           run: |
             sudo pkg_add git
-<<<<<<< HEAD:.github/workflows/arm64.yml
-=======
-            git clone https://github.com/hyoklee/h4
-            cd hdf4
->>>>>>> ff5e551f3bb2a9c1c0d7b12d697a53a5eff04ef0:.github/workflows/openbsd_arm64.yml
             sudo pkg_add cmake
             sudo pkg_add jpeg
             mkdir build

diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
@@ -26,18 +26,13 @@ jobs:
           FOO: A
           BAR: B        
         with:
-          environment_variables: FOO BAR        
+          environment_variables: FOO BAR
           operating_system: ${{ matrix.os.name }}
           architecture: ${{ matrix.os.architecture }}
           version: '${{ matrix.os.version }}'
-          shell: bash          
+          shell: bash
           run: |
             sudo pkg_add git
-<<<<<<< HEAD:.github/workflows/r.yml
-=======
-            git clone https://github.com/hyoklee/h4
-            cd hdf4
->>>>>>> ff5e551f3bb2a9c1c0d7b12d697a53a5eff04ef0:.github/workflows/openbsd.yml
             sudo pkg_add cmake
             sudo pkg_add jpeg
             mkdir build