From e808ad64d015a261dbe3b9ee3a6d9986ff072d52 Mon Sep 17 00:00:00 2001 From: Marco Craveiro Date: Thu, 29 Dec 2022 19:59:13 +0000 Subject: [PATCH] github: remove setup test data steps and associated scripts --- .github/workflows/codeql-analysis.yml | 3 - .github/workflows/continuous-linux.yml | 3 - .github/workflows/continuous-macos.yml | 3 - .github/workflows/continuous-windows.yml | 3 - .../nightly-create-fullgen-branch.yml | 3 - .github/workflows/nightly-fullgen-linux.yml | 3 - .github/workflows/nightly-linux.yml | 3 - build/scripts/github.setup.linux.sh | 54 ----------------- build/scripts/github.setup.macos.sh | 54 ----------------- build/scripts/github.setup.windows.ps1 | 59 ------------------- doc/agile/v1/sprint_backlog_32.org | 11 ++-- 11 files changed, 6 insertions(+), 193 deletions(-) delete mode 100755 build/scripts/github.setup.linux.sh delete mode 100755 build/scripts/github.setup.macos.sh delete mode 100644 build/scripts/github.setup.windows.ps1 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c61c0e44a8..a14ea9daa4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -55,9 +55,6 @@ jobs: with: appendedCacheKey: linux-clang-debug-codeql - - name: Setup test data - run: ./build/scripts/github.setup.linux.sh - - name: Build run: | cmake --preset linux-clang-debug diff --git a/.github/workflows/continuous-linux.yml b/.github/workflows/continuous-linux.yml index 5120c27355..8e762b339b 100644 --- a/.github/workflows/continuous-linux.yml +++ b/.github/workflows/continuous-linux.yml @@ -54,9 +54,6 @@ jobs: with: appendedCacheKey: ${{matrix.name}}${{matrix.buildtype}} - - name: Setup test data - run: ./build/scripts/github.setup.${{matrix.family}}.sh - - name: Run CTest workflow run: | export DOGEN_BUILD_PROVIDER="github" diff --git a/.github/workflows/continuous-macos.yml b/.github/workflows/continuous-macos.yml index 57f437ba3c..b7f65caf85 100644 --- a/.github/workflows/continuous-macos.yml +++ b/.github/workflows/continuous-macos.yml @@ -44,9 +44,6 @@ jobs: with: appendedCacheKey: ${{matrix.name}}${{matrix.buildtype}} - - name: Setup test data - run: ./build/scripts/github.setup.${{matrix.family}}.sh - - name: Run CTest workflow run: | export DOGEN_BUILD_PROVIDER="github" diff --git a/.github/workflows/continuous-windows.yml b/.github/workflows/continuous-windows.yml index febc0eab94..7785d65f25 100644 --- a/.github/workflows/continuous-windows.yml +++ b/.github/workflows/continuous-windows.yml @@ -39,9 +39,6 @@ jobs: with: appendedCacheKey: ${{matrix.name}}${{matrix.buildtype}} - - name: Setup test data - run: ./build/scripts/github.setup.${{matrix.family}}.ps1 - - name: Run CTest workflow run: | $env:DOGEN_BUILD_PROVIDER="github" diff --git a/.github/workflows/nightly-create-fullgen-branch.yml b/.github/workflows/nightly-create-fullgen-branch.yml index 5ca482bfe0..8f2cfe6b44 100644 --- a/.github/workflows/nightly-create-fullgen-branch.yml +++ b/.github/workflows/nightly-create-fullgen-branch.yml @@ -58,9 +58,6 @@ jobs: with: appendedCacheKey: ${{matrix.name}}${{matrix.buildtype}} - - name: Setup test data - run: ./build/scripts/github.setup.${{matrix.family}}.sh - - name: Run CTest workflow env: WITH_FULL_GENERATION: ON diff --git a/.github/workflows/nightly-fullgen-linux.yml b/.github/workflows/nightly-fullgen-linux.yml index 416ee4f6e3..1245bd2c8a 100644 --- a/.github/workflows/nightly-fullgen-linux.yml +++ b/.github/workflows/nightly-fullgen-linux.yml @@ -75,9 +75,6 @@ jobs: with: appendedCacheKey: ${{matrix.name}}${{matrix.buildtype}} - - name: Setup test data - run: ./build/scripts/github.setup.${{matrix.family}}.sh - - name: Run CTest workflow env: WITH_FULL_GENERATION: ON diff --git a/.github/workflows/nightly-linux.yml b/.github/workflows/nightly-linux.yml index aba108536d..a3c99417cf 100644 --- a/.github/workflows/nightly-linux.yml +++ b/.github/workflows/nightly-linux.yml @@ -72,9 +72,6 @@ jobs: with: appendedCacheKey: ${{matrix.name}}${{matrix.buildtype}} - - name: Setup test data - run: ./build/scripts/github.setup.${{matrix.family}}.sh - - name: Run CTest workflow run: | export DOGEN_BUILD_PROVIDER="github" diff --git a/build/scripts/github.setup.linux.sh b/build/scripts/github.setup.linux.sh deleted file mode 100755 index 5f03a2cdcd..0000000000 --- a/build/scripts/github.setup.linux.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2012-2022 Marco Craveiro -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. -# -cpp_ref_impl_input_location="https://github.com/MASD-Project/cpp_ref_impl/archive/master.zip" -cpp_ref_impl_output_location="${RUNNER_TEMP}/cpp_ref_impl.zip" -echo "Download file: ${cpp_ref_impl_output_location}" - -cpp_ref_impl_extract_dir="${GITHUB_WORKSPACE}/../.." -echo "Extract dir: ${cpp_ref_impl_extract_dir}" - -wget --no-check-certificate ${cpp_ref_impl_input_location} -O ${cpp_ref_impl_output_location} -unzip -q ${cpp_ref_impl_output_location} -d ${cpp_ref_impl_extract_dir} -mkdir ${cpp_ref_impl_extract_dir}/cpp_ref_impl -mv ${cpp_ref_impl_extract_dir}/cpp_ref_impl-master ${cpp_ref_impl_extract_dir}/cpp_ref_impl/master - -frozen_input_location="https://github.com/MASD-Project/frozen/archive/master.zip" -frozen_output_location="${RUNNER_TEMP}/frozen.zip" -echo "Download file: ${frozen_output_location}" - -frozen_extract_dir="${GITHUB_WORKSPACE}/../.." -echo "Extract dir: ${frozen_extract_dir}" - -wget --no-check-certificate ${frozen_input_location} -O ${frozen_output_location} -unzip -q ${frozen_output_location} -d ${frozen_extract_dir} -mkdir ${frozen_extract_dir}/frozen -mv ${frozen_extract_dir}/frozen-master ${frozen_extract_dir}/frozen/master - -csharp_ref_impl_input_location="https://github.com/MASD-Project/csharp_ref_impl/archive/master.zip" -csharp_ref_impl_output_location="${RUNNER_TEMP}/csharp_ref_impl.zip" -echo "Download file: ${csharp_ref_impl_output_location}" - -csharp_ref_impl_extract_dir="${GITHUB_WORKSPACE}/../.." -echo "Extract dir: ${csharp_ref_impl_extract_dir}" - -wget --no-check-certificate ${csharp_ref_impl_input_location} -O ${csharp_ref_impl_output_location} -unzip -q ${csharp_ref_impl_output_location} -d ${csharp_ref_impl_extract_dir} -mkdir ${csharp_ref_impl_extract_dir}/csharp_ref_impl -mv ${csharp_ref_impl_extract_dir}/csharp_ref_impl-master ${csharp_ref_impl_extract_dir}/csharp_ref_impl/master diff --git a/build/scripts/github.setup.macos.sh b/build/scripts/github.setup.macos.sh deleted file mode 100755 index 0d1814c13f..0000000000 --- a/build/scripts/github.setup.macos.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2012-2022 Marco Craveiro -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. -# -cpp_ref_impl_input_location="https://github.com/MASD-Project/cpp_ref_impl/archive/master.zip" -cpp_ref_impl_output_location="${RUNNER_TEMP}/cpp_ref_impl.zip" -echo "Download file: ${cpp_ref_impl_output_location}" - -cpp_ref_impl_extract_dir="${GITHUB_WORKSPACE}/../.." -echo "Extract dir: ${cpp_ref_impl_extract_dir}" - -curl -L -o ${cpp_ref_impl_output_location} ${cpp_ref_impl_input_location} -unzip -q ${cpp_ref_impl_output_location} -d ${cpp_ref_impl_extract_dir} -mkdir ${cpp_ref_impl_extract_dir}/cpp_ref_impl -mv ${cpp_ref_impl_extract_dir}/cpp_ref_impl-master ${cpp_ref_impl_extract_dir}/cpp_ref_impl/master - -frozen_input_location="https://github.com/MASD-Project/frozen/archive/master.zip" -frozen_output_location="${RUNNER_TEMP}/frozen.zip" -echo "Download file: ${frozen_output_location}" - -frozen_extract_dir="${GITHUB_WORKSPACE}/../.." -echo "Extract dir: ${frozen_extract_dir}" - -curl -L -o ${frozen_output_location} ${frozen_input_location} -unzip -q ${frozen_output_location} -d ${frozen_extract_dir} -mkdir ${frozen_extract_dir}/frozen -mv ${frozen_extract_dir}/frozen-master ${frozen_extract_dir}/frozen/master - -csharp_ref_impl_input_location="https://github.com/MASD-Project/csharp_ref_impl/archive/master.zip" -csharp_ref_impl_output_location="${RUNNER_TEMP}/csharp_ref_impl.zip" -echo "Download file: ${csharp_ref_impl_output_location}" - -csharp_ref_impl_extract_dir="${GITHUB_WORKSPACE}/../.." -echo "Extract dir: ${csharp_ref_impl_extract_dir}" - -curl -L -o ${csharp_ref_impl_output_location} ${csharp_ref_impl_input_location} -unzip -q ${csharp_ref_impl_output_location} -d ${csharp_ref_impl_extract_dir} -mkdir ${csharp_ref_impl_extract_dir}/csharp_ref_impl -mv ${csharp_ref_impl_extract_dir}/csharp_ref_impl-master ${csharp_ref_impl_extract_dir}/csharp_ref_impl/master diff --git a/build/scripts/github.setup.windows.ps1 b/build/scripts/github.setup.windows.ps1 deleted file mode 100644 index 13f85f15c4..0000000000 --- a/build/scripts/github.setup.windows.ps1 +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (C) 2012-2022 Marco Craveiro -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. -# -$ref_models_dir="$Env:GITHUB_WORKSPACE\..\.." -Write-Host "Reference models: $ref_models_dir" - -$downloads_dir="$Env:RUNNER_TEMP\" -Write-Host "Downloads dir: $downloads_dir" - -$cpp_ref_impl_input_location="https://github.com/MASD-Project/cpp_ref_impl/archive/master.zip" -$cpp_ref_impl_output_location="${downloads_dir}\cpp_ref_impl.zip" -$cpp_ref_impl_extract_dir="$ref_models_dir" - -Write-Host "URL: $cpp_ref_impl_input_location" -Write-Host "Download location: $cpp_ref_impl_output_location" -Invoke-WebRequest -OutFile $cpp_ref_impl_output_location $cpp_ref_impl_input_location -Set-Location -Path $cpp_ref_impl_extract_dir | Out-Null -7z x $cpp_ref_impl_output_location > $null -New-Item -Path "$cpp_ref_impl_extract_dir" -Name "cpp_ref_impl" -ItemType "directory" -Move-Item -Path $cpp_ref_impl_extract_dir/cpp_ref_impl-master -Destination $cpp_ref_impl_extract_dir/cpp_ref_impl/master - -$frozen_input_location="https://github.com/MASD-Project/frozen/archive/master.zip" -$frozen_output_location="${downloads_dir}\frozen.zip" -$frozen_extract_dir="$ref_models_dir" - -Write-Host "URL: $frozen_input_location" -Write-Host "Download location: $frozen_output_location" -Invoke-WebRequest -OutFile $frozen_output_location $frozen_input_location -Set-Location -Path $frozen_extract_dir | Out-Null -7z x $frozen_output_location > $null -New-Item -Path "$frozen_extract_dir" -Name "frozen" -ItemType "directory" -Move-Item -Path $frozen_extract_dir/frozen-master -Destination $frozen_extract_dir/frozen/master - -$csharp_ref_impl_input_location="https://github.com/MASD-Project/csharp_ref_impl/archive/master.zip" -$csharp_ref_impl_output_location="${downloads_dir}\csharp_ref_impl.zip" -$csharp_ref_impl_extract_dir="$ref_models_dir" - -Write-Host "URL: $csharp_ref_impl_input_location" -Write-Host "Download location: $csharp_ref_impl_output_location" -Invoke-WebRequest -OutFile $csharp_ref_impl_output_location $csharp_ref_impl_input_location -Set-Location -Path $csharp_ref_impl_extract_dir | Out-Null -7z x $csharp_ref_impl_output_location > $null -New-Item -Path "$csharp_ref_impl_extract_dir" -Name "csharp_ref_impl" -ItemType "directory" -Move-Item -Path $csharp_ref_impl_extract_dir/csharp_ref_impl-master -Destination $csharp_ref_impl_extract_dir/csharp_ref_impl/master diff --git a/doc/agile/v1/sprint_backlog_32.org b/doc/agile/v1/sprint_backlog_32.org index 442ef2c48b..7f2a4e0a56 100644 --- a/doc/agile/v1/sprint_backlog_32.org +++ b/doc/agile/v1/sprint_backlog_32.org @@ -13,14 +13,14 @@ ** Active #+begin: clocktable :maxlevel 3 :scope subtree :indent nil :emphasize nil :scope file :narrow 75 :formula % -#+CAPTION: Clock summary at [2022-12-29 Thu 19:55] +#+CAPTION: Clock summary at [2022-12-29 Thu 19:59] | <75> | | | | | | Headline | Time | | | % | |-----------------------------------------------------------+---------+-------+-------+-------| -| *Total time* | *81:47* | | | 100.0 | +| *Total time* | *81:50* | | | 100.0 | |-----------------------------------------------------------+---------+-------+-------+-------| -| Stories | 81:47 | | | 100.0 | -| Active | | 81:47 | | 100.0 | +| Stories | 81:50 | | | 100.0 | +| Active | | 81:50 | | 100.0 | | Edit release notes for previous sprint | | | 10:13 | 12.5 | | Create a demo and presentation for previous sprint | | | 2:06 | 2.6 | | Update boost to latest in vcpg | | | 0:20 | 0.4 | @@ -48,7 +48,7 @@ | Nightly builds are taking too long | | | 5:04 | 6.2 | | Add support for UML profiles and XMI | | | 0:11 | 0.2 | | Remove Dia and JSON support from Dogen | | | 3:23 | 4.1 | -| Make reference products git sub-modules | | | 0:38 | 0.8 | +| Make reference products git sub-modules | | | 0:41 | 0.8 | | Ignore vcpkg path length warning | | | 0:12 | 0.2 | | Windows package is broken | | | 0:20 | 0.4 | | Warning on OSX build | | | 2:23 | 2.9 | @@ -1739,6 +1739,7 @@ Notes: *** COMPLETED Make reference products git sub-modules :story: :LOGBOOK: + CLOCK: [2022-12-29 Thu 19:56]--[2022-12-29 Thu 19:59] => 0:03 CLOCK: [2022-12-29 Thu 19:47]--[2022-12-29 Thu 19:55] => 0:08 CLOCK: [2022-12-29 Thu 19:16]--[2022-12-29 Thu 19:46] => 0:30 :END: