From cd654c71f8167cb2d5e8a91370867b5bb94505f7 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Thu, 27 Feb 2020 17:54:23 +0000 Subject: [PATCH 01/41] Add gitflow --- .gitpod.Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 7fba9e6..552ca4c 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -16,5 +16,6 @@ RUN apt-get update \ USER gitpod -# Install pip packages -RUN python3 -m pip install pip==20.0.2 meson==0.53.0 gcovr==4.2 ninja==1.9.0.post1 +# Install packages +RUN python3 -m pip install pip==20.0.2 meson==0.53.0 gcovr==4.2 ninja==1.9.0.post1 \ + && brew install git-flow From c5acc9cfba2d94ba8ff7f72d283d3346c8976c81 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Thu, 27 Feb 2020 19:29:25 +0000 Subject: [PATCH 02/41] Add some tools --- .gitpod.Dockerfile | 16 ++++++++++--- .gitpod.yml | 5 +++- Dangerfile | 1 + Gemfile | 7 ++++++ Gemfile.lock | 59 ++++++++++++++++++++++++++++++++++++++++++++++ Vagrantfile | 20 ++++++++++++++++ 6 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 Dangerfile create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Vagrantfile diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 552ca4c..5a6ff4f 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -11,11 +11,21 @@ RUN apt-get update \ python3-wheel=0.32.3-2 \ valgrind=1:3.14.0-2ubuntu6 \ ccache=3.6-1 \ - && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* \ - && /usr/sbin/update-ccache-symlinks + libvirt-daemon-system=5.0.0-1ubuntu2.6 \ + qemu-kvm=1.2.0+noroms-0ubuntu2.12.10.7 \ + libvirt-clients=5.0.0-1ubuntu2.6 \ + && /usr/sbin/update-ccache-symlinks \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* + +# Download and install Vagrant +RUN curl -O https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb \ + && apt install ./vagrant_2.2.7_x86_64.deb \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* USER gitpod # Install packages RUN python3 -m pip install pip==20.0.2 meson==0.53.0 gcovr==4.2 ninja==1.9.0.post1 \ - && brew install git-flow + && brew install git-flow \ + && vagrant plugin install vagrant-libvirt \ + && bundle install diff --git a/.gitpod.yml b/.gitpod.yml index 79f065a..329b1ac 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -3,4 +3,7 @@ image: vscode: extensions: - asabil.meson@1.2.0:sYg01j3Mm+6RJtaIRwyR5A== - - ms-vscode.cpptools@0.26.3:Pq/tmf2WN3SanVzB4xZc1g== + - bbenoist.vagrant@0.5.0:e2ktoGsnar8weYYRNdvexg== +# - wingrunr21.vscode-ruby@0.26.0:VakXVw0C77hAQ3U3AZTn1Q== +# - rebornix.ruby@0.26.0:RN+gv0dPjYfMqlcEEralhg== + - Orta.vscode-danger@1.0.1:cGUzsroSPSoihE2Yps+qbA== diff --git a/Dangerfile b/Dangerfile new file mode 100644 index 0000000..770c8bb --- /dev/null +++ b/Dangerfile @@ -0,0 +1 @@ +message("Hello, this worked") diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..737fb90 --- /dev/null +++ b/Gemfile @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } + +gem 'danger' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..9790622 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,59 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + claide (1.0.3) + claide-plugins (0.9.2) + cork + nap + open4 (~> 1.3) + colored2 (3.1.2) + cork (0.3.0) + colored2 (~> 3.1) + danger (6.2.2) + claide (~> 1.0) + claide-plugins (>= 0.9.2) + colored2 (~> 3.1) + cork (~> 0.1) + faraday (~> 0.9) + faraday-http-cache (~> 2.0) + git (~> 1.6) + kramdown (~> 2.0) + kramdown-parser-gfm (~> 1.0) + no_proxy_fix + octokit (~> 4.7) + terminal-table (~> 1) + faraday (0.17.3) + multipart-post (>= 1.2, < 3) + faraday-http-cache (2.0.0) + faraday (~> 0.8) + git (1.6.0) + rchardet (~> 1.8) + kramdown (2.1.0) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + multipart-post (2.1.1) + nap (1.1.0) + no_proxy_fix (0.1.2) + octokit (4.16.0) + faraday (>= 0.9) + sawyer (~> 0.8.0, >= 0.5.3) + open4 (1.3.4) + public_suffix (4.0.3) + rchardet (1.8.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + unicode-display_width (1.6.1) + +PLATFORMS + ruby + +DEPENDENCIES + danger + +BUNDLED WITH + 2.1.3 diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..37a8ff2 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,20 @@ +Vagrant.configure("2") do |config| +# config.vm.provider :libvirt do |libvirt| +# # Use QEMU session instead of system connection +# libvirt.qemu_use_session = true +# # URI of QEMU session connection, default is as below +# libvirt.uri = 'qemu:///session' +# # URI of QEMU system connection, use to obtain IP address for management, default is below +# libvirt.system_uri = 'qemu:///system' +# # Path to store Libvirt images for the virtual machine, default is as ~/.local/share/libvirt/images +# libvirt.storage_pool_path = '/home/user/.local/share/libvirt/images' +# # Management network device, default is below +# libvirt.management_network_device = 'virbr0' +# end + +# # Public network configuration using existing network device +# # Note: Private networks do not work with QEMU session enabled as root access is required to create new network devices +# config.vm.network :public_network, :dev => "virbr1", +# :mode => "bridge", +# :type => "bridge" +end From 065cc1820050ea46bb60e09fe051be93a27a91f1 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Thu, 27 Feb 2020 19:31:30 +0000 Subject: [PATCH 03/41] Remove qemu version --- .gitpod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 5a6ff4f..7d8173e 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ valgrind=1:3.14.0-2ubuntu6 \ ccache=3.6-1 \ libvirt-daemon-system=5.0.0-1ubuntu2.6 \ - qemu-kvm=1.2.0+noroms-0ubuntu2.12.10.7 \ + qemu-kvm \ libvirt-clients=5.0.0-1ubuntu2.6 \ && /usr/sbin/update-ccache-symlinks \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* From e63b596e58cfb48820bf6cc3a76c44d2a1387ed2 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Thu, 27 Feb 2020 19:40:44 +0000 Subject: [PATCH 04/41] Fix Gitpod --- .gitpod.Dockerfile | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 7d8173e..44f8d46 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -2,7 +2,7 @@ FROM gitpod/workspace-full:build-branch-master USER root -# Install packages +# Install system packages RUN apt-get update \ && apt-get install -yq --no-install-recommends \ python3=3.7.3-1 \ @@ -11,21 +11,27 @@ RUN apt-get update \ python3-wheel=0.32.3-2 \ valgrind=1:3.14.0-2ubuntu6 \ ccache=3.6-1 \ - libvirt-daemon-system=5.0.0-1ubuntu2.6 \ - qemu-kvm \ - libvirt-clients=5.0.0-1ubuntu2.6 \ + libvirt=5.0.0-1ubuntu2.6 \ + qemu-kvm=1:3.1+dfsg-2ubuntu3.7 \ && /usr/sbin/update-ccache-symlinks \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* # Download and install Vagrant RUN curl -O https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb \ && apt install ./vagrant_2.2.7_x86_64.deb \ + && usermod -a -G libvirt gitpod \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* USER gitpod -# Install packages -RUN python3 -m pip install pip==20.0.2 meson==0.53.0 gcovr==4.2 ninja==1.9.0.post1 \ - && brew install git-flow \ - && vagrant plugin install vagrant-libvirt \ - && bundle install +# Install pip packages +RUN python3 -m pip install pip==20.0.2 meson==0.53.0 gcovr==4.2 ninja==1.9.0.post1 + +# Install Homebrew packages +RUN brew install git-flow + +# Install Ruby gems +RUN bundle install + +# Install Vagrant plugins +RUN vagrant plugin install vagrant-libvirt From f32c3e6592884f13ccec04446aa036940967f858 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Thu, 27 Feb 2020 19:44:19 +0000 Subject: [PATCH 05/41] Add back libvirt package --- .gitpod.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 44f8d46..14bbe9e 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -11,8 +11,9 @@ RUN apt-get update \ python3-wheel=0.32.3-2 \ valgrind=1:3.14.0-2ubuntu6 \ ccache=3.6-1 \ - libvirt=5.0.0-1ubuntu2.6 \ + libvirt-daemon-system=5.0.0-1ubuntu2.6 \ qemu-kvm=1:3.1+dfsg-2ubuntu3.7 \ + libvirt-clients=5.0.0-1ubuntu2.6 \ && /usr/sbin/update-ccache-symlinks \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* From b18efb983ed0687604384c8beef0e258cf7228b8 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Thu, 27 Feb 2020 19:49:03 +0000 Subject: [PATCH 06/41] Try to fix packages --- .gitpod.Dockerfile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 14bbe9e..5ba608f 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -25,14 +25,8 @@ RUN curl -O https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.de USER gitpod -# Install pip packages -RUN python3 -m pip install pip==20.0.2 meson==0.53.0 gcovr==4.2 ninja==1.9.0.post1 - -# Install Homebrew packages -RUN brew install git-flow - -# Install Ruby gems -RUN bundle install - -# Install Vagrant plugins -RUN vagrant plugin install vagrant-libvirt +# Install packages +RUN python3 -m pip install pip==20.0.2 meson==0.53.0 gcovr==4.2 ninja==1.9.0.post1 \ + && brew install git-flow \ + && bundle install \ + && vagrant plugin install vagrant-libvirt From bd12eee3b33a92d010a9b484976c5ba152075812 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Thu, 27 Feb 2020 19:53:46 +0000 Subject: [PATCH 07/41] Remove bundle install --- .gitpod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 5ba608f..de2d2b8 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -28,5 +28,5 @@ USER gitpod # Install packages RUN python3 -m pip install pip==20.0.2 meson==0.53.0 gcovr==4.2 ninja==1.9.0.post1 \ && brew install git-flow \ - && bundle install \ +# && bundle install \ && vagrant plugin install vagrant-libvirt From 861d00e593e2bef6c0a15d04ea823f8a2110478c Mon Sep 17 00:00:00 2001 From: BSFishy Date: Thu, 27 Feb 2020 20:12:43 +0000 Subject: [PATCH 08/41] Add libvirt packages --- .gitpod.Dockerfile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index de2d2b8..27183f6 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -11,10 +11,25 @@ RUN apt-get update \ python3-wheel=0.32.3-2 \ valgrind=1:3.14.0-2ubuntu6 \ ccache=3.6-1 \ - libvirt-daemon-system=5.0.0-1ubuntu2.6 \ + && /usr/sbin/update-ccache-symlinks \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* + +# Install libvirt packages +RUN apt-get update \ + && apt-get build-dep ruby-libvirt=0.7.1-1 \ + && apt-get install -yq --no-install-recommends \ + qemu=1:3.1+dfsg-2ubuntu3.7 \ qemu-kvm=1:3.1+dfsg-2ubuntu3.7 \ + libvirt-daemon-system=5.0.0-1ubuntu2.6 \ libvirt-clients=5.0.0-1ubuntu2.6 \ - && /usr/sbin/update-ccache-symlinks \ + ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ + dnsmasq-base=2.80-1ubuntu1 \ + && apt-get install -yq --no-install-recommends \ + libxslt-dev=1.1.32-2ubuntu0.2 \ + libxml2-dev=2.9.4+dfsg1-7ubuntu3 \ + libvirt-dev=5.0.0-1ubuntu2.6 \ + zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ + ruby-dev=1:2.5.1 \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* # Download and install Vagrant From 1391bc7a90b88e26b2ab1f51e99845cd5231b30f Mon Sep 17 00:00:00 2001 From: BSFishy Date: Thu, 27 Feb 2020 20:14:49 +0000 Subject: [PATCH 09/41] Try to fix packages --- .gitpod.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 27183f6..4be455f 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -16,7 +16,8 @@ RUN apt-get update \ # Install libvirt packages RUN apt-get update \ - && apt-get build-dep ruby-libvirt=0.7.1-1 \ + && apt-get install -yq --no-install-recommends \ + ruby-libvirt=0.7.1-1 \ && apt-get install -yq --no-install-recommends \ qemu=1:3.1+dfsg-2ubuntu3.7 \ qemu-kvm=1:3.1+dfsg-2ubuntu3.7 \ From 1ccdb810a0f1d2eb56f1920984b68855eae7fcc6 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Thu, 27 Feb 2020 20:17:54 +0000 Subject: [PATCH 10/41] Remove xslt version --- .gitpod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 4be455f..4799d99 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -26,7 +26,7 @@ RUN apt-get update \ ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ dnsmasq-base=2.80-1ubuntu1 \ && apt-get install -yq --no-install-recommends \ - libxslt-dev=1.1.32-2ubuntu0.2 \ + libxslt-dev \ libxml2-dev=2.9.4+dfsg1-7ubuntu3 \ libvirt-dev=5.0.0-1ubuntu2.6 \ zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ From 35675afefe6337623720f822ecd38f5a0a310cc4 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Thu, 27 Feb 2020 20:24:31 +0000 Subject: [PATCH 11/41] Remove package --- .gitpod.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 4799d99..f300564 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -26,7 +26,6 @@ RUN apt-get update \ ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ dnsmasq-base=2.80-1ubuntu1 \ && apt-get install -yq --no-install-recommends \ - libxslt-dev \ libxml2-dev=2.9.4+dfsg1-7ubuntu3 \ libvirt-dev=5.0.0-1ubuntu2.6 \ zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ From 85730bb7ed55a7d9e8b5148883881a2539ae89af Mon Sep 17 00:00:00 2001 From: BSFishy Date: Fri, 28 Feb 2020 17:17:16 +0000 Subject: [PATCH 12/41] Some work on Vagrant --- .gitignore | 1 + .gitpod.Dockerfile | 1 + Vagrantfile | 37 ++++++++++++++++++++----------------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 3dfbf54..f47a06d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ build/ cmake-*/ vgcore.* core.* +.vagrant/ diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index f300564..d06daf5 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -30,6 +30,7 @@ RUN apt-get update \ libvirt-dev=5.0.0-1ubuntu2.6 \ zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ ruby-dev=1:2.5.1 \ + && sudo virsh net-autostart virbr0 \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* # Download and install Vagrant diff --git a/Vagrantfile b/Vagrantfile index 37a8ff2..65835b2 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,20 +1,23 @@ Vagrant.configure("2") do |config| -# config.vm.provider :libvirt do |libvirt| -# # Use QEMU session instead of system connection -# libvirt.qemu_use_session = true -# # URI of QEMU session connection, default is as below -# libvirt.uri = 'qemu:///session' -# # URI of QEMU system connection, use to obtain IP address for management, default is below -# libvirt.system_uri = 'qemu:///system' -# # Path to store Libvirt images for the virtual machine, default is as ~/.local/share/libvirt/images -# libvirt.storage_pool_path = '/home/user/.local/share/libvirt/images' -# # Management network device, default is below -# libvirt.management_network_device = 'virbr0' -# end + # Use Ubuntu 19.04 as the default box + config.vm.box = "generic/ubuntu1904" -# # Public network configuration using existing network device -# # Note: Private networks do not work with QEMU session enabled as root access is required to create new network devices -# config.vm.network :public_network, :dev => "virbr1", -# :mode => "bridge", -# :type => "bridge" + config.vm.provider :libvirt do |libvirt| + # Use QEMU session instead of system connection + libvirt.qemu_use_session = true + # URI of QEMU session connection, default is as below + libvirt.uri = 'qemu:///session' + # URI of QEMU system connection, use to obtain IP address for management, default is below + libvirt.system_uri = 'qemu:///system' + # Path to store Libvirt images for the virtual machine, default is as ~/.local/share/libvirt/images + libvirt.storage_pool_path = '/home/gitpod/.local/share/libvirt/images' + # Management network device, default is below + libvirt.management_network_device = 'virbr0' + end + + # Public network configuration using existing network device + # Note: Private networks do not work with QEMU session enabled as root access is required to create new network devices + config.vm.network :public_network, :dev => "virbr1", + :mode => "bridge", + :type => "bridge" end From e00f94a90224f41b4648dad416f8072e7f2e6c97 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Fri, 28 Feb 2020 17:40:18 +0000 Subject: [PATCH 13/41] More vagrant --- .gitpod.Dockerfile | 5 +++-- Vagrantfile | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index d06daf5..f04fcfa 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -26,17 +26,18 @@ RUN apt-get update \ ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ dnsmasq-base=2.80-1ubuntu1 \ && apt-get install -yq --no-install-recommends \ + libxslt-dev=1.1.32-2ubuntu0.2 \ libxml2-dev=2.9.4+dfsg1-7ubuntu3 \ libvirt-dev=5.0.0-1ubuntu2.6 \ zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ ruby-dev=1:2.5.1 \ - && sudo virsh net-autostart virbr0 \ +# && libvirtd --daemon \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* # Download and install Vagrant RUN curl -O https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb \ && apt install ./vagrant_2.2.7_x86_64.deb \ - && usermod -a -G libvirt gitpod \ + && usermod -a -G libvirt,libvirtd gitpod \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* USER gitpod diff --git a/Vagrantfile b/Vagrantfile index 65835b2..1b2f034 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,6 +1,7 @@ Vagrant.configure("2") do |config| # Use Ubuntu 19.04 as the default box config.vm.box = "generic/ubuntu1904" + config.vm.box_version = "2.0.6" config.vm.provider :libvirt do |libvirt| # Use QEMU session instead of system connection From fbc23018f7ed895a084393cc67d9178b134ce751 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Fri, 28 Feb 2020 17:48:22 +0000 Subject: [PATCH 14/41] Even more vagrant --- .gitpod.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index f04fcfa..1f83edb 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -26,18 +26,18 @@ RUN apt-get update \ ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ dnsmasq-base=2.80-1ubuntu1 \ && apt-get install -yq --no-install-recommends \ - libxslt-dev=1.1.32-2ubuntu0.2 \ + libxslt-dev \ libxml2-dev=2.9.4+dfsg1-7ubuntu3 \ libvirt-dev=5.0.0-1ubuntu2.6 \ zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ ruby-dev=1:2.5.1 \ -# && libvirtd --daemon \ + && libvirtd --daemon \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* # Download and install Vagrant RUN curl -O https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb \ && apt install ./vagrant_2.2.7_x86_64.deb \ - && usermod -a -G libvirt,libvirtd gitpod \ + && usermod -a -G libvirt gitpod \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* USER gitpod From f14e7e8c0fcee81e847f2920db565c7816d67be0 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Fri, 28 Feb 2020 18:21:15 +0000 Subject: [PATCH 15/41] Add xslt version --- .gitpod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 1f83edb..b1cf4ff 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -26,7 +26,7 @@ RUN apt-get update \ ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ dnsmasq-base=2.80-1ubuntu1 \ && apt-get install -yq --no-install-recommends \ - libxslt-dev \ + libxslt1-dev=1.1.32-2ubuntu0.2 \ libxml2-dev=2.9.4+dfsg1-7ubuntu3 \ libvirt-dev=5.0.0-1ubuntu2.6 \ zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ From 52b685b5ea0fbb3d4789142bbc7a2c8ba545c465 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Fri, 28 Feb 2020 18:27:11 +0000 Subject: [PATCH 16/41] Add qemu-utils --- .gitpod.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 1f83edb..02132a0 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update \ && apt-get install -yq --no-install-recommends \ qemu=1:3.1+dfsg-2ubuntu3.7 \ qemu-kvm=1:3.1+dfsg-2ubuntu3.7 \ + qemu-utils=1:3.1+dfsg-2ubuntu3.6 \ libvirt-daemon-system=5.0.0-1ubuntu2.6 \ libvirt-clients=5.0.0-1ubuntu2.6 \ ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ @@ -31,7 +32,7 @@ RUN apt-get update \ libvirt-dev=5.0.0-1ubuntu2.6 \ zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ ruby-dev=1:2.5.1 \ - && libvirtd --daemon \ +# && libvirtd --daemon \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* # Download and install Vagrant From 9d768a74237483fa6730d4ce65da5d798fc2d4e9 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Fri, 28 Feb 2020 18:42:32 +0000 Subject: [PATCH 17/41] Add start command --- .gitpod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index d244976..779085b 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -32,7 +32,7 @@ RUN apt-get update \ libvirt-dev=5.0.0-1ubuntu2.6 \ zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ ruby-dev=1:2.5.1 \ -# && libvirtd --daemon \ + && systemctl start libvirtd \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* # Download and install Vagrant From fb93a246008329c2b974bc20cdc263af1f764faf Mon Sep 17 00:00:00 2001 From: BSFishy Date: Fri, 28 Feb 2020 18:44:13 +0000 Subject: [PATCH 18/41] Fix dependencies --- .gitpod.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 779085b..5c0ffe6 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -22,6 +22,7 @@ RUN apt-get update \ qemu=1:3.1+dfsg-2ubuntu3.7 \ qemu-kvm=1:3.1+dfsg-2ubuntu3.7 \ qemu-utils=1:3.1+dfsg-2ubuntu3.6 \ + qemu-block-extra=1:3.1+dfsg-2ubuntu3.6 \ libvirt-daemon-system=5.0.0-1ubuntu2.6 \ libvirt-clients=5.0.0-1ubuntu2.6 \ ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ From c0a94bb52fda2defead58bc31bbd7e76db0cace6 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Fri, 28 Feb 2020 18:45:46 +0000 Subject: [PATCH 19/41] Fix kvm versions --- .gitpod.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 5c0ffe6..9bfddd5 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -21,8 +21,8 @@ RUN apt-get update \ && apt-get install -yq --no-install-recommends \ qemu=1:3.1+dfsg-2ubuntu3.7 \ qemu-kvm=1:3.1+dfsg-2ubuntu3.7 \ - qemu-utils=1:3.1+dfsg-2ubuntu3.6 \ - qemu-block-extra=1:3.1+dfsg-2ubuntu3.6 \ + qemu-utils=1:3.1+dfsg-2ubuntu3.7 \ + qemu-block-extra=1:3.1+dfsg-2ubuntu3.7 \ libvirt-daemon-system=5.0.0-1ubuntu2.6 \ libvirt-clients=5.0.0-1ubuntu2.6 \ ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ From a596374c07666e4e19b3a6a9e2a2b555cfad0e6c Mon Sep 17 00:00:00 2001 From: BSFishy Date: Fri, 28 Feb 2020 18:46:59 +0000 Subject: [PATCH 20/41] Remove unneeded package --- .gitpod.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 9bfddd5..f93d073 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -22,7 +22,6 @@ RUN apt-get update \ qemu=1:3.1+dfsg-2ubuntu3.7 \ qemu-kvm=1:3.1+dfsg-2ubuntu3.7 \ qemu-utils=1:3.1+dfsg-2ubuntu3.7 \ - qemu-block-extra=1:3.1+dfsg-2ubuntu3.7 \ libvirt-daemon-system=5.0.0-1ubuntu2.6 \ libvirt-clients=5.0.0-1ubuntu2.6 \ ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ From e64fff48e5d04ccc802da8a4c1c463fbafe0ac27 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Fri, 28 Feb 2020 18:47:18 +0000 Subject: [PATCH 21/41] Remove service start --- .gitpod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index f93d073..bb22ef4 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -32,7 +32,7 @@ RUN apt-get update \ libvirt-dev=5.0.0-1ubuntu2.6 \ zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ ruby-dev=1:2.5.1 \ - && systemctl start libvirtd \ +# && systemctl start libvirtd \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* # Download and install Vagrant From aa19b2039530c80121add7019662fc79aef4463a Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 17:17:46 +0000 Subject: [PATCH 22/41] Remove Vagrant dependencies --- .gitpod.Dockerfile | 54 +++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index bb22ef4..387481e 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -14,37 +14,37 @@ RUN apt-get update \ && /usr/sbin/update-ccache-symlinks \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* -# Install libvirt packages -RUN apt-get update \ - && apt-get install -yq --no-install-recommends \ - ruby-libvirt=0.7.1-1 \ - && apt-get install -yq --no-install-recommends \ - qemu=1:3.1+dfsg-2ubuntu3.7 \ - qemu-kvm=1:3.1+dfsg-2ubuntu3.7 \ - qemu-utils=1:3.1+dfsg-2ubuntu3.7 \ - libvirt-daemon-system=5.0.0-1ubuntu2.6 \ - libvirt-clients=5.0.0-1ubuntu2.6 \ - ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ - dnsmasq-base=2.80-1ubuntu1 \ - && apt-get install -yq --no-install-recommends \ - libxslt1-dev=1.1.32-2ubuntu0.2 \ - libxml2-dev=2.9.4+dfsg1-7ubuntu3 \ - libvirt-dev=5.0.0-1ubuntu2.6 \ - zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ - ruby-dev=1:2.5.1 \ -# && systemctl start libvirtd \ - && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* +# Disable Vagrant stuff for now. When VM's are supported, this will be uncommented. +# # Install libvirt packages +# RUN apt-get update \ +# && apt-get install -yq --no-install-recommends \ +# ruby-libvirt=0.7.1-1 \ +# && apt-get install -yq --no-install-recommends \ +# qemu=1:3.1+dfsg-2ubuntu3.7 \ +# qemu-kvm=1:3.1+dfsg-2ubuntu3.7 \ +# qemu-utils=1:3.1+dfsg-2ubuntu3.7 \ +# libvirt-daemon-system=5.0.0-1ubuntu2.6 \ +# libvirt-clients=5.0.0-1ubuntu2.6 \ +# ebtables=2.0.10.4+snapshot20181205-1ubuntu1 \ +# dnsmasq-base=2.80-1ubuntu1 \ +# && apt-get install -yq --no-install-recommends \ +# libxslt1-dev=1.1.32-2ubuntu0.2 \ +# libxml2-dev=2.9.4+dfsg1-7ubuntu3 \ +# libvirt-dev=5.0.0-1ubuntu2.6 \ +# zlib1g-dev=1:1.2.11.dfsg-1ubuntu2 \ +# ruby-dev=1:2.5.1 \ +# && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* -# Download and install Vagrant -RUN curl -O https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb \ - && apt install ./vagrant_2.2.7_x86_64.deb \ - && usermod -a -G libvirt gitpod \ - && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* +# # Download and install Vagrant +# RUN curl -O https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb \ +# && apt install ./vagrant_2.2.7_x86_64.deb \ +# && usermod -a -G libvirt gitpod \ +# && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* USER gitpod # Install packages RUN python3 -m pip install pip==20.0.2 meson==0.53.0 gcovr==4.2 ninja==1.9.0.post1 \ - && brew install git-flow \ + && brew install git-flow # && bundle install \ - && vagrant plugin install vagrant-libvirt +# && vagrant plugin install vagrant-libvirt From 0a76122220a97a3a64ec42b02e0783461d9ca93f Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 17:18:34 +0000 Subject: [PATCH 23/41] Add bundle install --- .gitpod.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 387481e..9e7a7aa 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -45,6 +45,6 @@ USER gitpod # Install packages RUN python3 -m pip install pip==20.0.2 meson==0.53.0 gcovr==4.2 ninja==1.9.0.post1 \ - && brew install git-flow -# && bundle install \ + && brew install git-flow \ + && bundle install # && vagrant plugin install vagrant-libvirt From 6f9114e5f9ceacd64c1865a076b769d420dd5ac6 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 17:31:43 +0000 Subject: [PATCH 24/41] Fix bundler --- .gitpod.Dockerfile | 4 ++-- .gitpod.yml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 9e7a7aa..2205157 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -45,6 +45,6 @@ USER gitpod # Install packages RUN python3 -m pip install pip==20.0.2 meson==0.53.0 gcovr==4.2 ninja==1.9.0.post1 \ - && brew install git-flow \ - && bundle install + && brew install git-flow +# && bundle install # && vagrant plugin install vagrant-libvirt diff --git a/.gitpod.yml b/.gitpod.yml index 329b1ac..4d3f537 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,3 +1,6 @@ +tasks: + - init: + bundle install image: file: .gitpod.Dockerfile vscode: From 3d36396cfc78273f964f67c5ee1827da5048cd22 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 17:47:00 +0000 Subject: [PATCH 25/41] Add some changes to actions --- .github/workflows/build.yml | 2 ++ .github/workflows/danger.yml | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 .github/workflows/danger.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf41e13..a130700 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: [push] jobs: build: + name: CI Build strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] @@ -47,6 +48,7 @@ jobs: - name: Test run: ninja -C build test minify: + name: File Minify runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml new file mode 100644 index 0000000..d41fe26 --- /dev/null +++ b/.github/workflows/danger.yml @@ -0,0 +1,14 @@ +name: Danger check + +on: [push, pull_request] + +jobs: + danger: + name: Danger Check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Bundle Install + run: bundle install + - name: Danger + run: bundle exec danger --verbose From cc87545c74b8472973db7a2b11d21136f642f51f Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 17:50:44 +0000 Subject: [PATCH 26/41] Fix danger workflow --- .github/workflows/danger.yml | 10 ++++++++-- .gitignore | 1 + .gitpod.yml | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index d41fe26..c445c31 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -8,7 +8,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Bundle Install - run: bundle install + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6 + - name: Setup environment + run: | + gem install bundler + bundle install --jobs 4 --retry 3 - name: Danger run: bundle exec danger --verbose diff --git a/.gitignore b/.gitignore index f47a06d..d8a3813 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ cmake-*/ vgcore.* core.* .vagrant/ +.bundle/ diff --git a/.gitpod.yml b/.gitpod.yml index 4d3f537..43c2799 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,6 +1,6 @@ tasks: - init: - bundle install + bundle install --jobs 4 --retry 3 image: file: .gitpod.Dockerfile vscode: From 6be2b0409715f7fdc53e583affa5c1f81942aae5 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 18:25:07 +0000 Subject: [PATCH 27/41] Test Danger action --- .github/workflows/danger.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index c445c31..4b69f0c 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -8,13 +8,15 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6 - - name: Setup environment - run: | - gem install bundler - bundle install --jobs 4 --retry 3 - - name: Danger - run: bundle exec danger --verbose + - name: Run Danger + uses: danger/danger@6.3.0 + # - name: Setup Ruby + # uses: actions/setup-ruby@v1 + # with: + # ruby-version: 2.6 + # - name: Setup environment + # run: | + # gem install bundler + # bundle install --jobs 4 --retry 3 + # - name: Danger + # run: bundle exec danger --verbose From 5efebcd52da19856facbd236202164c5dcb0dcbd Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 18:29:05 +0000 Subject: [PATCH 28/41] Install ruby --- .github/workflows/danger.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 4b69f0c..d3eddbe 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -8,6 +8,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Setup Ruby + uses: actions/setup-ruby@v1 - name: Run Danger uses: danger/danger@6.3.0 # - name: Setup Ruby From 998c2cf3f9536917155e95dee393bd68583b1d68 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 18:31:42 +0000 Subject: [PATCH 29/41] Install Danger --- .github/workflows/danger.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index d3eddbe..99b95e1 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -8,8 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Setup Ruby - uses: actions/setup-ruby@v1 + - name: Setup environment + run: | + bundle install --jobs 4 --retry 3 - name: Run Danger uses: danger/danger@6.3.0 # - name: Setup Ruby From 8d4e8096dfbcc1dd68118a71531ea675e513423a Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 18:34:55 +0000 Subject: [PATCH 30/41] Use old config --- .github/workflows/danger.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 99b95e1..599ff0b 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -8,18 +8,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Setup environment - run: | - bundle install --jobs 4 --retry 3 - - name: Run Danger - uses: danger/danger@6.3.0 - # - name: Setup Ruby - # uses: actions/setup-ruby@v1 - # with: - # ruby-version: 2.6 # - name: Setup environment # run: | - # gem install bundler # bundle install --jobs 4 --retry 3 - # - name: Danger - # run: bundle exec danger --verbose + # - name: Run Danger + # uses: danger/danger@6.3.0 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + - name: Setup environment + run: | + gem install bundler + bundle install --jobs 4 --retry 3 + - name: Danger + run: bundle exec danger --verbose From cd74f05905e08ffb68d95638df135207538d76f7 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 18:39:21 +0000 Subject: [PATCH 31/41] Add API Token --- .github/workflows/danger.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 599ff0b..6813061 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -20,4 +20,6 @@ jobs: gem install bundler bundle install --jobs 4 --retry 3 - name: Danger - run: bundle exec danger --verbose + run: | + export DANGER_GITHUB_API_TOKEN=${{ secrets.GITHUB_TOKEN }} + bundle exec danger --verbose From f6893b65c7c1a5bdb983f86e85f554819110d8d4 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 18:46:43 +0000 Subject: [PATCH 32/41] Add version --- .github/workflows/danger.yml | 11 +++-------- Gemfile | 6 +----- Gemfile.lock | 6 +++--- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 6813061..005541b 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -8,18 +8,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - # - name: Setup environment - # run: | - # bundle install --jobs 4 --retry 3 - # - name: Run Danger - # uses: danger/danger@6.3.0 - name: Setup Ruby uses: actions/setup-ruby@v1 - name: Setup environment run: | - gem install bundler + gem install bundler -v 2.1.4 bundle install --jobs 4 --retry 3 - - name: Danger + - name: Run Danger run: | export DANGER_GITHUB_API_TOKEN=${{ secrets.GITHUB_TOKEN }} - bundle exec danger --verbose + bundle exec danger diff --git a/Gemfile b/Gemfile index 737fb90..9607a6c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,3 @@ -# frozen_string_literal: true - source "https://rubygems.org" -git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } - -gem 'danger' +gem 'danger', '6.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9790622..60d0c24 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,7 +11,7 @@ GEM colored2 (3.1.2) cork (0.3.0) colored2 (~> 3.1) - danger (6.2.2) + danger (6.3.0) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -53,7 +53,7 @@ PLATFORMS ruby DEPENDENCIES - danger + danger (= 6.3.0) BUNDLED WITH - 2.1.3 + 2.1.4 From bf1670a4bf3ddaed9ed91e4eceaaed52bc40342b Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 18:48:49 +0000 Subject: [PATCH 33/41] Add verbose --- .github/workflows/danger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 005541b..481dd16 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -17,4 +17,4 @@ jobs: - name: Run Danger run: | export DANGER_GITHUB_API_TOKEN=${{ secrets.GITHUB_TOKEN }} - bundle exec danger + bundle exec danger --verbose From bce4d2a76102308894b9a47fc4e0c9a96db34e9a Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 19:04:11 +0000 Subject: [PATCH 34/41] Changes to actions --- .github/workflows/{danger.yml => pull.yml} | 4 ++-- .github/workflows/{build.yml => push.yml} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{danger.yml => pull.yml} (83%) rename .github/workflows/{build.yml => push.yml} (98%) diff --git a/.github/workflows/danger.yml b/.github/workflows/pull.yml similarity index 83% rename from .github/workflows/danger.yml rename to .github/workflows/pull.yml index 481dd16..b5e1e93 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/pull.yml @@ -1,6 +1,6 @@ -name: Danger check +name: Pull Actions -on: [push, pull_request] +on: [pull_request, pull_request_review, pull_request_review_comment] jobs: danger: diff --git a/.github/workflows/build.yml b/.github/workflows/push.yml similarity index 98% rename from .github/workflows/build.yml rename to .github/workflows/push.yml index a130700..2eed1b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/push.yml @@ -1,4 +1,4 @@ -name: Build & test CI +name: Push Actions on: [push] From a2329b4cefd45c9d176ac496962091f9b6e3fc3b Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 19:50:02 +0000 Subject: [PATCH 35/41] Fix clang tidy --- .clang-tidy | 2 +- assertions.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 20b4175..8ad4909 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -26,4 +26,4 @@ CheckOptions: - key: readability-identifier-naming.FunctionCase value: camelBack - key: readability-magic-numbers.IgnoredIntegerValues - value: {1, 2, 3, 4, 5, 6, 7, 8, 9} + value: '1;2;3;4;5;6;7;8;9;' diff --git a/assertions.h b/assertions.h index be39faa..8851ad6 100644 --- a/assertions.h +++ b/assertions.h @@ -9,8 +9,8 @@ * apart from variadic utility macros. */ -#ifndef _ASSERTIONS_H -#define _ASSERTIONS_H +#ifndef ASSERTIONS_H +#define ASSERTIONS_H #include #include From 7bea8e3d2e0e5aac023440114a284dc6e1bc7ad8 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Mon, 2 Mar 2020 19:57:42 +0000 Subject: [PATCH 36/41] Update Dangerfile --- .clang-tidy | 2 +- Dangerfile | 45 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 8ad4909..fd3f4ac 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -26,4 +26,4 @@ CheckOptions: - key: readability-identifier-naming.FunctionCase value: camelBack - key: readability-magic-numbers.IgnoredIntegerValues - value: '1;2;3;4;5;6;7;8;9;' + value: 1;2;3;4;5;6;7;8;9; diff --git a/Dangerfile b/Dangerfile index 770c8bb..292ca57 100644 --- a/Dangerfile +++ b/Dangerfile @@ -1 +1,44 @@ -message("Hello, this worked") +# Check if the Dangerfile was changed +has_dangerfile_changes = git.modified_files.include? "Dangerfile" +# Check if the Gemfile was changed +has_gemfile_changes = git.modified_files.include? "Gemfile" +# Check if the license file was changed +has_license_changes = git.modified_files.include? "UNLICENSE" +# Check if the header was changed +has_app_changes = git.modified_files.include? "assertions.h" +# Check if any of the tests were changed +has_test_changes = !git.modified_files.grep(/test/).empty? + +# Allow Bitmodo members to bypass some checks +unless github.api.organization_member?('bitmodo', github.pr_author) + # Fail if the PR does not provide a description + failure "Please provide a summary in the Pull Request description" if github.pr_body.length < 5 + + # Fail if the license was modified by an external user + failure "The license has been modified" if has_license_changes + + # Warn if the Dangerfile was changed by an external contributor + warn "#{github.html_link("Dangerfile")} has been modified by external contributor" if has_dangerfile_changes + + # Warn if the Gemfile was changed by an external contributor + warn "#{github.html_link("Gemfile")} has been modified by external contributor" if has_gemfile_changes + + # Provide a thanks message if the user is external + message ":+1: Thank you for contributing!" +else + # Warn if the license has been modified + warn "The license has been modified" if has_license_changes + + # Provide a message if the user is internal + message ":ok_hand:" +end + +# Warn if the header has changed but the tests have not +warn "Tests have not been updated" if has_app_changes && !has_test_changes + +# Create a warning if the PR is a work in progress +warn "PR is classed as Work in Progress" if github.pr_title.include? "[WIP]" +# Warn if the PR is not assigned to anyone +warn "This PR does not have any assignees yet." unless github.pr_json["assignee"] +# Warn if the PR is not mergeable +warn "This PR cannot be merged yet" unless github.pr_json["mergeable"] From b24f1b20ec2a6ee0fb171bb20bc8e76b0e382485 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Tue, 3 Mar 2020 17:35:24 +0000 Subject: [PATCH 37/41] Change bot token --- .github/workflows/pull.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index b5e1e93..986dea4 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -16,5 +16,5 @@ jobs: bundle install --jobs 4 --retry 3 - name: Run Danger run: | - export DANGER_GITHUB_API_TOKEN=${{ secrets.GITHUB_TOKEN }} + export DANGER_GITHUB_API_TOKEN=${{ secrets.BOT_TOKEN }} bundle exec danger --verbose From c224cfa60b6c92f5453ca3a3bf1dee99da427d57 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Tue, 3 Mar 2020 17:41:00 +0000 Subject: [PATCH 38/41] Fix ruby version --- .github/workflows/pull.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 986dea4..d15d891 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -10,6 +10,8 @@ jobs: - uses: actions/checkout@v2 - name: Setup Ruby uses: actions/setup-ruby@v1 + with: + ruby-version: '2.6' - name: Setup environment run: | gem install bundler -v 2.1.4 From 5710789f974aa8123bbe5fb7a85e46b85eb3e7b2 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Tue, 3 Mar 2020 17:53:10 +0000 Subject: [PATCH 39/41] Test --- Dangerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dangerfile b/Dangerfile index 292ca57..9992285 100644 --- a/Dangerfile +++ b/Dangerfile @@ -35,7 +35,6 @@ end # Warn if the header has changed but the tests have not warn "Tests have not been updated" if has_app_changes && !has_test_changes - # Create a warning if the PR is a work in progress warn "PR is classed as Work in Progress" if github.pr_title.include? "[WIP]" # Warn if the PR is not assigned to anyone From 66607b9e0ca7831abec809ecc5955e0b5c36fbe9 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Tue, 3 Mar 2020 18:28:56 +0000 Subject: [PATCH 40/41] Small changes to Dangerfile --- Dangerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dangerfile b/Dangerfile index 9992285..2caf912 100644 --- a/Dangerfile +++ b/Dangerfile @@ -8,6 +8,8 @@ has_license_changes = git.modified_files.include? "UNLICENSE" has_app_changes = git.modified_files.include? "assertions.h" # Check if any of the tests were changed has_test_changes = !git.modified_files.grep(/test/).empty? +# Check if the PR is trivial +declared_trivial = (github.pr_title + github.pr_body).include?("#trivial") || !has_app_changes # Allow Bitmodo members to bypass some checks unless github.api.organization_member?('bitmodo', github.pr_author) @@ -34,7 +36,7 @@ else end # Warn if the header has changed but the tests have not -warn "Tests have not been updated" if has_app_changes && !has_test_changes +warn "Tests have not been updated" if has_app_changes && !has_test_changes && !declared_trivial # Create a warning if the PR is a work in progress warn "PR is classed as Work in Progress" if github.pr_title.include? "[WIP]" # Warn if the PR is not assigned to anyone From ddc8326ee09afa3423d9cb552736b585a8350d88 Mon Sep 17 00:00:00 2001 From: BSFishy Date: Tue, 3 Mar 2020 18:42:31 +0000 Subject: [PATCH 41/41] Add semantic-release --- .github/workflows/push.yml | 15 +++++++++++++++ .releaserc | 9 +++++++++ 2 files changed, 24 insertions(+) create mode 100644 .releaserc diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2eed1b4..3e37293 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -47,6 +47,7 @@ jobs: run: ninja -C build - name: Test run: ninja -C build test + minify: name: File Minify runs-on: ubuntu-latest @@ -60,3 +61,17 @@ jobs: with: name: Minified artifacts path: artifacts + + semver: + name: Semantic Release + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Setup Node.js + uses: actions/setup-node@v1 + with: + node-version: 12 + - name: Release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: npx semantic-release diff --git a/.releaserc b/.releaserc new file mode 100644 index 0000000..17cb5e2 --- /dev/null +++ b/.releaserc @@ -0,0 +1,9 @@ +branches: + - master + - name: 'release?(/*)' + prerelease: true + +plugins: + - '@semantic-release/commit-analyzer' + - '@semantic-release/release-notes-generator' + - '@semantic-release/github'