From 409936fe3e84c4d5dafa4f6ce485bde2c64da629 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Wed, 15 Feb 2023 19:55:17 -0500 Subject: [PATCH 1/3] fhmcgvn --- src/main/java/frc/robot/RobotContainer.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 4a5236f..2f46998 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -8,18 +8,10 @@ import edu.wpi.first.wpilibj.Joystick; import edu.wpi.first.wpilibj.XboxController; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; -import edu.wpi.first.wpilibj2.command.RunCommand; -<<<<<<< HEAD -import edu.wpi.first.wpilibj2.command.button.CommandXboxController; import edu.wpi.first.wpilibj2.command.button.JoystickButton; import edu.wpi.first.wpilibj2.command.button.Trigger; -======= -<<<<<<< HEAD + import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; -======= -import edu.wpi.first.wpilibj2.command.button.JoystickButton; ->>>>>>> ded3f6018fe8a2c8b719139889c406330ff44003 ->>>>>>> f1d0e3b3526aaeeafab0416ba8e92344786ea73c //subsystems import frc.robot.subsystems.BasePilotable; import frc.robot.subsystems.Gratte; From f92c66dcd7fc03e3db7a09a003fb1b9609af111e Mon Sep 17 00:00:00 2001 From: Olivier Demers Date: Fri, 17 Feb 2023 15:55:49 +0000 Subject: [PATCH 2/3] retour du ci --- .gitlab-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..18ff083 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,13 @@ +default: + image: gradle:jdk11 + tags: + - robot + +stages: # List of stages for jobs, and their order of execution + - build + +build-job: # This job runs in the build stage, which runs first. + stage: build + script: + - chmod +x gradlew + - ./gradlew build From 253d785bf4621eb5284641c08b24769d6f034ada Mon Sep 17 00:00:00 2001 From: Olivier Demers Date: Sun, 19 Feb 2023 21:19:36 -0500 Subject: [PATCH 3/3] Fixed incomplete merge --- src/main/java/frc/robot/Robot.java | 1 - src/main/java/frc/robot/RobotContainer.java | 13 +------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java index 50229b4..2da5318 100644 --- a/src/main/java/frc/robot/Robot.java +++ b/src/main/java/frc/robot/Robot.java @@ -6,7 +6,6 @@ package frc.robot; import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.CommandScheduler; diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 9f46643..abd26bf 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -4,23 +4,12 @@ package frc.robot; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.XboxController; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; -<<<<<<< HEAD -import edu.wpi.first.wpilibj2.command.button.JoystickButton; -import edu.wpi.first.wpilibj2.command.button.Trigger; - import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; -======= import edu.wpi.first.wpilibj2.command.RunCommand; import edu.wpi.first.wpilibj2.command.button.CommandXboxController; -import edu.wpi.first.wpilibj2.command.button.JoystickButton; -import edu.wpi.first.wpilibj2.command.button.Trigger; -import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; -import edu.wpi.first.wpilibj2.command.button.JoystickButton; ->>>>>>> 856a2295bef699955297a016b8d5ddd1d8bd68d8 + //subsystems import frc.robot.subsystems.BasePilotable; import frc.robot.subsystems.Gratte;