test github merge workflow

.github/workflows/push.yml

@@ -19,7 +19,7 @@ jobs:
         target: [esp32, esp32s2, esp32s3, esp32c3]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install dependencies
       run: bash ./tools/prepare-ci.sh
     - name: Build Libs for ${{ matrix.target }}

.gitignore

@@ -19,3 +19,6 @@ sdkconfig
 sdkconfig.old
 version.txt
 dependencies.lock
+
+# Object files
+*.o

CMakeLists.txt

@@ -1,11 +1,11 @@
 # The following lines of boilerplate have to be in your project's
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
-
+#BOYD this didn't seem to be in 4.4, it might need to go
 set(ENV{BLUEPAD32_ARDUINO} TRUE)
 
 set(RMAKER_PATH ${CMAKE_SOURCE_DIR}/components/esp-rainmaker)
-set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components)
+set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(arduino-lib-builder)

README.md

@@ -5,54 +5,17 @@ This repository contains the scripts that produce the libraries included with es
 Tested on Ubuntu (32 and 64 bit), Raspberry Pi and MacOS.
 
 ### Build on Ubuntu and Raspberry Pi
-```bash
-sudo apt-get install git wget curl libssl-dev libncurses-dev flex bison gperf python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja-build ccache jq
-sudo pip install --upgrade pip
-git clone https://github.com/espressif/esp32-arduino-lib-builder
-cd esp32-arduino-lib-builder
-./build.sh
-
-### Build for Bluepad32
-
-Copy Bluepad32 componetns.
-
-```sh
-cd components
-cp -r ~/esp-idf-arduino-bluepad32-template/components/* .
-```
-
-Build it
-
-```sh
-# All targets. esp32-s2 already removed from the supported boards
-./build.sh -s
-```
-
-Update:
-
-```sh
-# Already patched to copy to ~/Arduino/hardware/retro.moe/esp32-bluepad32
-. ./tools/copy-to-arduino.sh
-```
+Execute the quickSetupAws.sh script
 
 #### When ESP32 releases a new version
 
-1. Download the .zip
-2. Unzip it in ~/Arduino/hardware/retro.moe/...
-3. rename it to esp32-bluepad32
-4. create `package` folder: `mkdir esp32-bluepad32/package`
+1. Delete the components/arduino directory
+2. Update AR_BRANCH in tools/config.sh, or pass it in as the -A options of the build script
+3. Run build.sh
 
-And repeat previous steps.
 
 ### Release
 
-1. Copy `bluepad32_files/boards.txt` and `bluepad32_files/platform.txt` to `~/Arduino/hardware/retro.moe/esp32-bluepad32`
-2. Copy `bluepad32_files/libraries/` to `~/Arduino/hardware/retro.moe/esp32-bluepad32/libraries/`
-3. Upload .zip to https://github.com/ricardoquesada/esp32-arduino-lib-builder
-4. Update `bluepad32_files/package_esp32_bluepad32_index.json` accordingly
-
-
-```sh
-cp bluepad32_files/boards.txt bluepad32_files/platform.txt ~/Arduino/hardware/retro.moe/esp32-bluepad32
-cp -r bluepad32_files/libraries/* ~/Arduino/hardware/retro.moe/esp32-bluepad32/libraries/
-```
+1. Create a branch with the name of the version you want (i.e "1.0.0" or "release/1.0.0" - both will end up with a release called "1.0.0")
+2. Check out that branch on your dev box
+3. Run the tools/phasedock-release.sh script and enter your login credentials.