Moving gitflow code lab down a directory, in prep for adding more (#4)

GirlsOfSteelRobotics · Oct 22, 2020 · 0f5c059 · 0f5c059
1 parent 636979d
commit 0f5c059
Show file tree

Hide file tree

Showing 39 changed files with 294 additions and 104 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -18,4 +18,5 @@ jobs:
         java-version: 1.11
 
     - name: Build Robot
+      working-directory: gitflow
       run: ./gradlew build
diff --git a/.gitignore b/.gitignore
@@ -247,8 +247,3 @@ imgui.ini
 **/build/
 
 # End of https://www.gitignore.io/api/java,gradle,intellij+iml,visualstudiocode,linux,macos,windows,c++,visualstudiocode
-
-# SnobotSim
-logs/
-simulator_config/joystick_config.properties
-simulator_config/networktables.ini*
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/runConfigurations/Build___Deploy_Robot.xml b/.idea/runConfigurations/Build___Deploy_Robot.xml
diff --git a/.idea/runConfigurations/Build___Deploy_Robot_for_Debugging.xml b/.idea/runConfigurations/Build___Deploy_Robot_for_Debugging.xml
diff --git a/.idea/runConfigurations/Clean_Build___Deploy_Robot.xml b/.idea/runConfigurations/Clean_Build___Deploy_Robot.xml
diff --git a/.idea/runConfigurations/Clean_Build___Deploy_Robot_for_Debugging.xml b/.idea/runConfigurations/Clean_Build___Deploy_Robot_for_Debugging.xml
diff --git a/...a/runConfigurations/Clean_Build_Robot.xml → ...gurations/_girflow__Clean_Build_Robot.xml b/...a/runConfigurations/Clean_Build_Robot.xml → ...gurations/_girflow__Clean_Build_Robot.xml
diff --git a/.idea/runConfigurations/Build_Robot.xml → ...nConfigurations/_gitflow__Build_Robot.xml b/.idea/runConfigurations/Build_Robot.xml → ...nConfigurations/_gitflow__Build_Robot.xml
diff --git a/.idea/runConfigurations/Run_Snobot_Sim.xml → ...nfigurations/_gitflow__Run_Snobot_Sim.xml b/.idea/runConfigurations/Run_Snobot_Sim.xml → ...nfigurations/_gitflow__Run_Snobot_Sim.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Codelab.iml b/Codelab.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>