m12watanabe1a 2023-03-07
Fix release CI
@4619082024ebb18e6b283eb5dc4116cc6d0f08ec
.github/workflows/ci_galactic.yml
--- .github/workflows/ci_galactic.yml
+++ .github/workflows/ci_galactic.yml
@@ -33,6 +33,7 @@
           import-token: ${{ secrets.GITHUB_TOKEN }}
           package-name: |
             p9n_bringup
-            p9n_interface
             p9n_example
+            p9n_interface
+            p9n_node
             p9n_test
.github/workflows/ci_humble.yml
--- .github/workflows/ci_humble.yml
+++ .github/workflows/ci_humble.yml
@@ -32,7 +32,9 @@
           target-ros2-distro: ${{ matrix.ros_distribution }}
           import-token: ${{ secrets.GITHUB_TOKEN }}
           package-name: |
+            p9n
             p9n_bringup
-            p9n_interface
             p9n_example
+            p9n_interface
+            p9n_node
             p9n_test
 
.github/workflows/release.yaml (deleted)
--- .github/workflows/release.yaml
@@ -1,82 +0,0 @@
-name: Release
-on:
-  workflow_dispatch:
-    inputs:
-      fragment:
-        type: choice
-        description: Semantic version target
-        options:
-          - bug
-          - feature
-          - major
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install dependencies
-        run: |
-          sudo apt-get update && sudo apt-get install xmlstarlet
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: Get current version
-        id: get_current_version
-        run: |
-          current_version=`\
-            find . -name "package.xml" -print -quit \
-            | xargs -n 1 -I{} \
-            xmlstarlet select --template --value-of "//package/version" {}`
-          echo "current_version=$current_version" >> $GITHUB_OUTPUT
-      - name: Bump release version
-        id: bump_version
-        uses: christian-draeger/increment-semantic-version@1.0.3
-        with:
-          current-version: ${{ steps.get_current_version.outputs.current_version }}
-          version-fragment: ${{ github.event.inputs.fragment }}
-      - name: Update package version
-        run: |
-          find . -type f -name package.xml | \
-            xargs -n 1 -I {} \
-            xmlstarlet edit --inplace --pf \
-            --update "//package/version" \
-            --value ${{ steps.bump_version.outputs.next-version }} {}
-      - name: Commit change
-        env:
-          user_name: ${{ github.repository_owner }}
-          user_email: 40206149+m12watanabe1a@users.noreply.github.com
-        run: |
-          git config --local user.name ${{ env.user_name }}
-          git config --local user.email ${{ env.user_email }}
-          git switch -c release/${{ steps.bump_version.outputs.next-version }}
-          git add -A
-          git commit -m "Version upgrade \
-            ${{ steps.get_current_version.outputs.current_version }} \
-            -> \
-            ${{ steps.bump_version.outputs.next-version }}"
-          git push --set-upstream origin release/${{ steps.bump_version.outputs.next-version }}
-      - name: Create Pull Request
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh pr create \
-          --title \
-            "Release ${{ github.event.inputs.fragment }} upgrade \
-            ${{ steps.get_current_version.outputs.current_version }} \
-            -> \
-            ${{ steps.bump_version.outputs.next-version }}" \
-          --base main \
-          --head release/${{ steps.bump_version.outputs.next-version }} \
-          -b "Version has been upgraded from \
-          ${{ steps.get_current_version.outputs.current_version }} \
-          -> \
-          ${{ steps.bump_version.outputs.next-version }}
-          Check the release page: ${{ github.server_url }}/${{ github.repository }}/releases
-          "
-      - name: Create release
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release create \
-            v${{ steps.bump_version.outputs.next-version }} \
-            -d --generate-notes \
-            --target release/${{ steps.bump_version.outputs.next-version }}
 
.github/workflows/release.yml (added)
+++ .github/workflows/release.yml
@@ -0,0 +1,36 @@
+name: release
+on:
+  workflow_dispatch:
+    inputs:
+      fragment:
+        type: choice
+        description: Semantic version target
+        options:
+          - bug
+          - feature
+          - major
+      target:
+        type: choice
+        description: Release target package name
+        options:
+          - p9n
+          - p9n_bringup
+          - p9n_example
+          - p9n_interface
+          - p9n_node
+          - p9n_test
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Upgrade version
+        id: upgrade
+        uses: HarvestX/ros2-release-ci-action@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          base_pkg: p9n
+        with:
+          target-package: ${{ github.event.inputs.target }}
+          version-fragment: ${{ github.event.inputs.fragment }}
+          create-release: ${{ github.event.inputs.target == env.base_pkg }}
.vscode/c_cpp_properties.json
--- .vscode/c_cpp_properties.json
+++ .vscode/c_cpp_properties.json
@@ -6,7 +6,7 @@
                 "limitSymbolsToIncludedHeaders": false
             },
             "includePath": [
-                "/opt/ros/galactic/include/**",
+                "/opt/ros/humble/include/**",
                 "/usr/include/**",
                 "${workspaceFolder}/p9n_interface/include/**",
                 "${workspaceFolder}/p9n_example/include/**",
.vscode/cspell.json
--- .vscode/cspell.json
+++ .vscode/cspell.json
@@ -4,11 +4,13 @@
   "words": [
     "bringup",
     "colcon",
+    "coveragepy",
     "distro",
     "dpad",
     "dualsense",
     "dualshock",
     "m12watanabe1a",
+    "osrf",
     "rclcpp",
     "remappings",
     "roboteq",
@@ -17,6 +19,7 @@
     "rviz",
     "teleop",
     "urdf",
+    "vcstool",
     "xacro"
   ]
 }
.vscode/settings.json
--- .vscode/settings.json
+++ .vscode/settings.json
@@ -1,9 +1,9 @@
 {
   "python.autoComplete.extraPaths": [
-    "/opt/ros/galactic/lib/python3.8/site-packages",
+    "/opt/ros/humble/lib/python3.10/site-packages",
   ],
   "python.analysis.extraPaths": [
-    "/opt/ros/galactic/lib/python3.8/site-packages"
+    "/opt/ros/humble/lib/python3.10/site-packages"
   ],
   "[cpp]": {
     "editor.tabSize": 2,
 
p9n/CMakeLists.txt (added)
+++ p9n/CMakeLists.txt
@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.8)
+project(p9n)
+
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  add_compile_options(-Wall -Wextra -Wpedantic)
+endif()
+
+# find dependencies
+find_package(ament_cmake REQUIRED)
+# uncomment the following section in order to fill in
+# further dependencies manually.
+# find_package(<dependency> REQUIRED)
+
+if(BUILD_TESTING)
+  find_package(ament_lint_auto REQUIRED)
+  # the following line skips the linter which checks for copyrights
+  # comment the line when a copyright and license is added to all source files
+  set(ament_cmake_copyright_FOUND TRUE)
+  # the following line skips cpplint (only works in a git repo)
+  # comment the line when this package is in a git repo and when
+  # a copyright and license is added to all source files
+  set(ament_cmake_cpplint_FOUND TRUE)
+  ament_lint_auto_find_test_dependencies()
+endif()
+
+ament_package()
 
p9n/LICENSE (added)
+++ p9n/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
p9n/package.xml (added)
+++ p9n/package.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
+  <name>p9n</name>
+  <version>1.0.1</version>
+  <description>HarvestX PlayStation Interface Packages.</description>
+  <maintainer email="40206149+m12watanabe1a@users.noreply.github.com">m12watanabe1a</maintainer>
+  <license>Apache-2.0</license>
+
+  <buildtool_depend>ament_cmake</buildtool_depend>
+
+  <depend>p9n_bringup</depend>
+  <depend>p9n_example</depend>
+  <depend>p9n_interface</depend>
+  <depend>p9n_node</depend>
+  <depend>p9n_test</depend>
+
+  <test_depend>ament_lint_auto</test_depend>
+  <test_depend>ament_lint_common</test_depend>
+
+  <export>
+    <build_type>ament_cmake</build_type>
+  </export>
+</package>(파일 끝에 줄바꿈 문자 없음)
Add a comment
List