Don’t show s3 progress

Upload to S3 with a raw command
Use okalachev/upload-s3-action to upload to S3
2026-06-02 18:19:33 +00:00 · 2021-06-29 03:57:04 +03:00 · 2021-06-29 02:39:31 +03:00 · 2021-06-29 01:10:45 +03:00 · 2021-06-28 20:51:06 +03:00 · 2021-06-28 19:59:20 +03:00
4 changed files with 4 additions and 14 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,8 +5,6 @@ on:
    branches: [ '*' ]
  pull_request:
    branches: [ master ]
-  release:
-    types: [ created ]

 jobs:
  build:
--- a/build.sh
+++ b/build.sh
@@ -32,17 +32,9 @@ ${PACKER} build ros_ide_vm.json

 echo "--- Marking the VM"

-# if [[ $GITHUB_REF == refs/tags/*-rc* ]]; then
-    # remove rc label
-    # VERSION=${GITHUB_REF#refs/tags/}
-    # VERSION=${VERSION/-rc*/}
-if [[ $GITHUB_REF == refs/tags/* ]]; then
-    VERSION=${GITHUB_REF#refs/tags/}
-else
-    VERSION=$(git describe --always)
-fi
-
-VM_NAME="clover-devel_${VERSION}.ova"
+GIT_REV=$(git rev-parse --short HEAD)
+GIT_DESCRIBE=$(git describe --always)
+VM_NAME="clover-devel_${GIT_DESCRIBE}.ova"
 mv ./output-virtualbox-ovf/clover-devel.ova ./output-virtualbox-ovf/${VM_NAME}
 ls -l output-virtualbox-ovf

--- a/ros_ide_vm.json
+++ b/ros_ide_vm.json
@@ -65,7 +65,7 @@
  },
  {
    "type": "shell",
-    "script": "scripts/install_software.sh",
+    "script": "scripts/installSoftware.sh",
    "execute_command": "PASSWORD='{{user `password`}}' bash '{{.Path}}'"
  }]
 }
--- a/scripts/install_software.sh
+++ b/scripts/install_software.sh
Author	SHA1	Message	Date
Oleg Kalachev	fc2661ad88	Don’t show s3 progress	2021-06-29 03:57:04 +03:00
Oleg Kalachev	2deb4bd54c	Upload to S3 with a raw command	2021-06-29 02:39:31 +03:00
Oleg Kalachev	dfb82608ad	Use okalachev/upload-s3-action to upload to S3	2021-06-29 01:10:45 +03:00
Oleg Kalachev	94d339639e	Upload image from Actions	2021-06-28 20:51:06 +03:00
Oleg Kalachev	3bc7fb406e	Disable deploy in Travis	2021-06-28 19:59:20 +03:00
Oleg Kalachev	62e41bed40	Use git describe --always for image name	2021-06-23 23:30:49 +03:00
Oleg Kalachev	31d0d6e2fc	Show built image size	2021-06-23 22:38:52 +03:00
Oleg Kalachev	f1fd8f73e8	Downgrade Node.js to v10.15.0	2021-06-23 21:44:01 +03:00
Oleg Kalachev	13e74f2d5b	Update Node.js to v14.17.1	2021-06-23 17:46:11 +03:00
Oleg Kalachev	763b158fb5	Use install_gitbook for gitbook installation	2021-06-23 17:45:46 +03:00
Oleg Kalachev	6efa9c89d7	Yet another attempt to enforce using PX4’s mavlink in sitl_gazebo	2021-06-23 09:04:48 +03:00
Oleg Kalachev	93af5e2700	Try another way to enforce using PX4’s mavlink	2021-06-23 03:36:57 +03:00
Oleg Kalachev	2eb18b7ab3	Clone Firmware recursively	2021-06-23 02:55:30 +03:00
Oleg Kalachev	ef008af9d2	Simplify setup setp	2021-06-23 02:54:37 +03:00
Oleg Kalachev	5e38d72e63	Add comment	2021-06-23 02:52:10 +03:00
Oleg Kalachev	ae92554d52	Enforce using PX4’s mavlink in sitl_gazebo Instead of ROS mavlink	2021-06-23 02:25:34 +03:00
Oleg Kalachev	6b464d83b9	Make examples directory a symlink	2021-06-23 00:06:05 +03:00
Oleg Kalachev	6a41aa1c21	Clone master branch of clover	2021-06-23 00:04:14 +03:00
Oleg Kalachev	3e22ed3824	Use base focal image	2021-06-23 00:03:17 +03:00
Oleg Kalachev	acf9d304d2	Use apt-get not apt apt issues warnings as it doesn’t have a stable interface	2021-06-22 23:52:42 +03:00
Oleg Kalachev	3621327929	Merge commit 'd0670f123588a5144f41c5626f49c952f061780a' into actions-noetic	2021-06-22 23:47:02 +03:00
Oleg Kalachev	0759a10973	Echo commands in install software script	2021-06-22 21:56:46 +03:00
Oleg Kalachev	e491ca6e18	Echo commands in build script	2021-06-22 21:55:39 +03:00
Oleg Kalachev	15b685ca06	Make build script work on mac and linux	2021-06-22 21:54:47 +03:00
Oleg Kalachev	09551d89e3	Use packer for darwin	2021-06-22 20:17:17 +03:00
Oleg Kalachev	ae652f0d1c	Try macos-10.15	2021-06-22 20:14:55 +03:00
Oleg Kalachev	2b5548fe7f	Try Ubuntu Bionic	2021-06-22 19:10:44 +03:00
Oleg Kalachev	969ed1dbdc	Use apt-get not apt	2021-06-22 19:06:10 +03:00
Oleg Kalachev	fc4b87bb64	Ubuntu 20.04	2021-06-22 19:02:51 +03:00
Oleg Kalachev	5fbcca0fa3	Simplify script	2021-06-22 19:00:03 +03:00
Oleg Kalachev	aaadd0f72e	Fix	2021-06-22 18:59:25 +03:00
Oleg Kalachev	b3faab68e1	Echo commands	2021-06-22 18:52:07 +03:00
Oleg Kalachev	93d75e8a02	Add GitHub actions workflow	2021-06-22 18:20:59 +03:00
Alexey Rogachevskiy	d0670f1235	ros_ide_vm: Don't try to disable scrensaver Apparently there's more to it than just this one file. Need to investigate further.	2020-10-27 00:06:59 +03:00
Alexey Rogachevskiy	5b599431a1	scripts: Re-add rqt_multiplot installation	2020-10-26 21:58:33 +03:00
Alexey Rogachevskiy	de95bbb2bb	scripts: Build against the 22 branch	2020-10-26 21:41:07 +03:00
Alexey Rogachevskiy	74a83d7159	ros_ide_vm: Remove vscode configuration It's all Python3 now	2020-10-26 21:39:54 +03:00
Alexey Rogachevskiy	244c678e46	scripts, ros_ide_vm: Disable screen autolock	2020-10-26 21:36:54 +03:00
Alexey Rogachevskiy	56e0f805db	scripts: Temporarily disable rqt_multiplot installation It is not yet released for Noetic. May have to build it from sources for x86_64.	2020-10-26 19:25:31 +03:00
Alexey Rogachevskiy	07c328484d	scripts: Use proper branch for clover	2020-10-26 11:06:03 +03:00
Alexey Rogachevskiy	dafebce445	scripts: Re-enable patching sitl_gazebo	2020-10-26 09:40:44 +03:00
Alexey Rogachevskiy	ed2e767748	scripts: Use absolute path for mav_comm clone	2020-10-26 08:32:51 +03:00
Alexey Rogachevskiy	407a1a30cf	scripts: Use Python3, noetic wherever possible	2020-10-25 23:58:34 +03:00
Alexey Rogachevskiy	b3dd27356e	assets: Update sitl_gazebo patch	2020-10-25 23:03:37 +03:00
Alexey Rogachevskiy	841f8f45b1	Update to Ubuntu Focal	2020-10-25 22:59:50 +03:00