Fixed merge conflict

UBCSailbot · Mar 18, 2023 · a7d76c9 · a7d76c9
1 parent 87cf8df
commit a7d76c9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 79 deletions.
diff --git a/.github/workflows/test_definitions.yml b/.github/workflows/test_definitions.yml
@@ -20,7 +20,8 @@ jobs:
     steps:
       - name: Checkout workspace
         uses: actions/checkout@v3
-        repository: UBCSailbot/sailbot_workspace
+        with: 
+            repository: UBCSailbot/sailbot_workspace
 
       - name: Checkout ROS package
         if: ${{ inputs.repository }} != ${{ github.event.repository.name }}
@@ -45,8 +46,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-        repository: UBCSailbot/sailbot_workspace
-
+        with: 
+            repository: UBCSailbot/sailbot_workspace
+
       - name: Checkout ROS package
         if: ${{ inputs.repository }} != ${{ github.event.repository.name }}
         uses: actions/checkout@v3
@@ -58,14 +60,16 @@ jobs:
         uses: ./.github/actions/ament-lint/
         env:
           LINTER: ${{ matrix.linter }}
+          DISABLE_VCS: ${{ inputs.disable-vcs }}
 
   clang-tidy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-        repository: UBCSailbot/sailbot_workspace
-
+        with: 
+            repository: UBCSailbot/sailbot_workspace
+
       - name: Checkout ROS package
         if: ${{ inputs.repository }} != ${{ github.event.repository.name }}
         uses: actions/checkout@v3
@@ -75,6 +79,8 @@ jobs:
 
       - name: Run linter
         uses: ./.github/actions/clang-tidy/
+        env:
+          DISABLE_VCS: ${{ inputs.disable-vcs }}
 
   # https://github.com/nosborn/github-action-markdown-cli
   markdownlint:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,82 +19,10 @@ on:
     - cron: '0 1 * * 5'
 
 jobs:
-<<<<<<< HEAD
 # Calls tests in sailbot_workspace 
 # https://github.com/UBCSailbot/sailbot_workspace
-  call-workflow-1-in-sailbot:
-        uses: UBCSailbot/sailbot_workspace/.github/workflows/tests.yml@11-Publish-ROS-package-actions_FINAL
+  tests:
+        uses: UBCSailbot/sailbot_workspace/.github/workflows/test_definitions.yml@user/colinli02/11-Publish-ROS-package-actions_FINAL
         with:
             repository: ${{ github.event.repository.name }}
             disable-vcs: false
-=======
-  colcon-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Test
-        uses: ./.github/actions/test/
-
-  ament-lint:
-    name: ament_${{ matrix.linter }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-          linter: [lint_cmake, xmllint, flake8, pep257]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Run linter
-        uses: ./.github/actions/ament-lint/
-        env:
-          LINTER: ${{ matrix.linter }}
-
-  clang-tidy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Run linter
-        uses: ./.github/actions/clang-tidy/
-
-  # https://github.com/nosborn/github-action-markdown-cli
-  markdownlint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check out code
-      uses: actions/checkout@v3
-
-    - name: Run linter
-      uses: nosborn/github-action-markdown-cli@v3.2.0
-      with:
-        config_file: .markdownlint.json
-        files: .
-        dot: true
-
-  # https://github.com/gaurav-nelson/github-action-markdown-link-check
-  markdown-link-check:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check out code
-      uses: actions/checkout@v3
-
-    - name: Run linter
-      uses: gaurav-nelson/github-action-markdown-link-check@v1
-      with:
-        config-file: .markdown-link-check.json
-        folder-path: .
-
-  rebuild-docs:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    steps:
-    - name: Dispatch Docs Publish workflow
-      # https://github.com/orgs/community/discussions/26323#discussioncomment-3251448
-      run: |
-        curl -XPOST -u "${{ secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/UBCSailbot/docs/actions/workflows/publish.yml/dispatches --data '{"ref": "main"}'
->>>>>>> e1e5e5e38a0c3461174befb6c2a0a4d4f4a65fbe