From 329118e5cea0099212dd7303953571a5e255578c Mon Sep 17 00:00:00 2001 From: Divya Goswami Date: Thu, 5 May 2022 17:56:30 +0530 Subject: [PATCH 01/36] Create CONTRIBUTE.md --- docs/CONTRIBUTE.md | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 docs/CONTRIBUTE.md diff --git a/docs/CONTRIBUTE.md b/docs/CONTRIBUTE.md new file mode 100644 index 0000000..c66371a --- /dev/null +++ b/docs/CONTRIBUTE.md @@ -0,0 +1,55 @@ +This repository is the deployed version of the main repository of Software Discovery Tool as a submodule and the data repository as a sub submodule. +Any contribution to SDT should be done in the main repository. + +# How To Deploy +The whole SDT deployment is maintained by: +- [cicd.yml]() workflow +- [config_build.py]() to create new sections in the distro config file +- [package_build.py]() to update existing distro files to latest versions + +# Contribute to the deployment workflow + +## Contribute to deployment script +The deployment uses [appleboy's ssh workflow](https://github.com/appleboy/ssh-action) +The deployment is thus triggered at every new pusb into the main branch. +The script section uses the required server credentials to be able to host the tool. +```yml +script: | + cd /opt/software-discovery-tool-deploy + sudo chown -R sdtuser . + git checkout main + git pull origin main --recurse-submodules + sudo cp -u -r software-discovery-tool/ ../software-discovery-tool/ + sudo chown -R apache:apache /opt/software-discovery-tool + sudo -u apache /opt/software-discovery-tool/bin/config_build.py + sudo apachectl restart +``` +It includes +- Pulling the latest changes +- Copies the contents to the main directory +- Uses config_build.py to check for new data files +- Uses package_build.py to update the existing files with the recent pkg versions +- Restart the server + +## Contribute to package_build.py +The binary has separate methods to extract data from Linux Distributions and [PDS](). +Check [SDT-data]() repo to find out the distro list we support. + +## Contribute to config_build.py +This file controls the `supported_distro.py` file that resides inside `src/config` directory. +It checks for any new data file inside `distro_files` directory and adds it's mapping to the `supported_distro.py`. +Any existing data file from PDS is updated from upstream. + + +_NOTE_ +Any contribution to the binary should be done in the main repository. + +# Report bugs and issues +Feel free to add new issues or features that you would like SDT to support. +Bugs are given high priority since this is an active project used by users of Z Systems. + +For deployment improvements, use this repository. +For new feature request to SDT, use the main repository. +For new data files request, use the data repository. + +Appreciating all the contributions that you do for the Open Mainframe Project. From 370aaca4a9ec0eb686a1692daa35ee9d3d8b721f Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 14:42:35 +0100 Subject: [PATCH 02/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 18 ++++++++++++++++++ README.md | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 .github/workflows/updatesubmodules.yml create mode 100644 README.md diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml new file mode 100644 index 0000000..3f8890e --- /dev/null +++ b/.github/workflows/updatesubmodules.yml @@ -0,0 +1,18 @@ +name: Sync submodules +on: workflow_dispatch +jobs: + + build: + name: Sync with Main repo + runs-on: ubuntu-latest + steps: + - name: ssh and pull and restart + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} + script: | + git pull --recurse-submodules + git submodule update --remote --recursive + git commit -am "Auto updated submodule references" && git push || echo "No changes to commit" diff --git a/README.md b/README.md new file mode 100644 index 0000000..a5bc716 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +# Live deployed version of SDT. +To contribute: +git clone --recursive git@github.com:openmainframeproject/software-discovery-tool-deploy.git + From 583ed77119e415bd36cbc1a2b402dfb37a6ad45d Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 14:44:20 +0100 Subject: [PATCH 03/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 3f8890e..b42f6f3 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -3,16 +3,16 @@ on: workflow_dispatch jobs: build: - name: Sync with Main repo - runs-on: ubuntu-latest - steps: - - name: ssh and pull and restart - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - script: | - git pull --recurse-submodules + name: Sync with Main repo + runs-on: ubuntu-latest + steps: + - name: ssh and pull and restart + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} + script: | + git pull --recurse-submodules git submodule update --remote --recursive git commit -am "Auto updated submodule references" && git push || echo "No changes to commit" From 336f164763b33f8f14372dd3f2dd2764c4ff58eb Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 14:51:02 +0100 Subject: [PATCH 04/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index b42f6f3..09bfa3c 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -15,4 +15,4 @@ jobs: script: | git pull --recurse-submodules git submodule update --remote --recursive - git commit -am "Auto updated submodule references" && git push || echo "No changes to commit" + git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" From 6d7610370a645138c3b56a0dfcf72cbec51bb118 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 14:52:35 +0100 Subject: [PATCH 05/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 09bfa3c..dcc4e07 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -2,17 +2,17 @@ name: Sync submodules on: workflow_dispatch jobs: - build: - name: Sync with Main repo - runs-on: ubuntu-latest - steps: - - name: ssh and pull and restart - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - script: | - git pull --recurse-submodules - git submodule update --remote --recursive - git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" + build: + name: Sync with Main repo + runs-on: ubuntu-latest + steps: + - name: ssh and pull and restart + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} + script: | + git pull --recurse-submodules + git submodule update --remote --recursive + git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" From 7b4cbc045ea05634ca286ad855b767529c4b6ab0 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 14:55:21 +0100 Subject: [PATCH 06/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index dcc4e07..e310842 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -2,7 +2,7 @@ name: Sync submodules on: workflow_dispatch jobs: - build: + sync: name: Sync with Main repo runs-on: ubuntu-latest steps: @@ -13,6 +13,7 @@ jobs: username: ${{ secrets.USERNAME }} key: ${{ secrets.KEY }} script: | - git pull --recurse-submodules - git submodule update --remote --recursive - git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" + cd /opt/software-discovery-tool-deploy + git pull --recurse-submodules + git submodule update --remote --recursive + git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" From 86ad77e14a790be017a29192fafca9396b008154 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 14:58:51 +0100 Subject: [PATCH 07/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 31 +++++++++++++------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index e310842..f7c2d99 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -1,19 +1,18 @@ name: Sync submodules on: workflow_dispatch jobs: - - sync: - name: Sync with Main repo - runs-on: ubuntu-latest - steps: - - name: ssh and pull and restart - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - script: | - cd /opt/software-discovery-tool-deploy - git pull --recurse-submodules - git submodule update --remote --recursive - git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" + sync: + name: Sync with Main repo + runs-on: ubuntu-latest + steps: + - name: ssh and pull and restart + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} + script: | + cd /opt/software-discovery-tool-deploy + git pull --recurse-submodules + git submodule update --remote --recursive + git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" From 5de53b73398f400fb0801b967b6c9a588de309a5 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 15:07:39 +0100 Subject: [PATCH 08/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index f7c2d99..797a0ed 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -1,18 +1,18 @@ name: Sync submodules on: workflow_dispatch jobs: - sync: + repo_sync: name: Sync with Main repo runs-on: ubuntu-latest steps: - - name: ssh and pull and restart - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - script: | - cd /opt/software-discovery-tool-deploy - git pull --recurse-submodules - git submodule update --remote --recursive - git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" + - name: ssh and git module update + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} + run: | + cd /opt/software-discovery-tool-deploy + git pull --recurse-submodules + git submodule update --remote --recursive + git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" From 21436212c5ce07672ca378b985d740c70cb0bfc6 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 15:21:58 +0100 Subject: [PATCH 09/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 797a0ed..c6e2622 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -1,18 +1,18 @@ name: Sync submodules on: workflow_dispatch jobs: - repo_sync: - name: Sync with Main repo - runs-on: ubuntu-latest - steps: - - name: ssh and git module update - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - run: | - cd /opt/software-discovery-tool-deploy - git pull --recurse-submodules - git submodule update --remote --recursive - git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" + repo_sync: + name: Sync with Main repo + runs-on: ubuntu-latest + steps: + - name: ssh and git module update + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} + script: | + cd /opt/software-discovery-tool-deploy + git pull --recurse-submodules + git submodule update --remote --recursive + git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" From ac588ea8a9286bf10e407c0691fd848e851bebd4 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 15:23:31 +0100 Subject: [PATCH 10/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index c6e2622..7f9b3f9 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -1,6 +1,7 @@ name: Sync submodules on: workflow_dispatch jobs: + repo_sync: name: Sync with Main repo runs-on: ubuntu-latest From 65403ae3b3dabe88bd7a8295e3cb48abd855eb21 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 15:28:55 +0100 Subject: [PATCH 11/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 7f9b3f9..de57bf2 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -9,11 +9,11 @@ jobs: - name: ssh and git module update uses: appleboy/ssh-action@master with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} script: | - cd /opt/software-discovery-tool-deploy - git pull --recurse-submodules - git submodule update --remote --recursive - git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" + cd /opt/software-discovery-tool-deploy + git pull --recurse-submodules + git submodule update --remote --recursive + git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" From e29160e9d39816311f4baf5195eaa0ea87f2c604 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 16:29:28 +0100 Subject: [PATCH 12/36] auto sync with main repo Signed-off-by: rachejazz --- README.md | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a5bc716..49786df 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,83 @@ -# Live deployed version of SDT. -To contribute: -git clone --recursive git@github.com:openmainframeproject/software-discovery-tool-deploy.git +# Bootstrapping the Software Discovery Tool Deployment Repository +## Introduction +This guide will walk you through the process of setting up the Software Discovery Tool deployment repository from scratch on an Ubuntu system. We'll use submodules to include the main repository and the data repository within the deployment repository. +## What are Submodules? +Submodules in Git allow you to include other Git repositories as subdirectories of your own repository. In our case, we use submodules to include the main Software Discovery Tool repository and the data repository within the deployment repository. + +# Step-by-Step Instructions +1. Install Ubuntu: +Follow the installation instructions for Ubuntu on your virtual machine (VM) [Link](https://ubuntu.com/tutorials/how-to-run-ubuntu-desktop-on-a-virtual-machine-using-virtualbox#1-overview) + +2. Clone the Deployment Repository: +Use the following command to clone the deployment repository and its submodules: +```sudo git clone --recurse-submodules https://github.com/openmainframeproject/software-discovery-tool-deploy.git /opt/software-discovery-tool-deploy``` +This command will clone the deployment repository and automatically initialize and update all submodules. + +3. Create Symbolic Link: +Create a symbolic link to the Software Discovery Tool directory: +```sudo ln -s /opt/software-discovery-tool-deploy/software-discovery-tool/ /opt/software-discovery-tool +``` +This command creates a symbolic link named `/opt/software-discovery-tool` pointing to the `software-discovery-tool` directory within the deployment repository. + +# Directory Structure +After completing the above steps, your directory structure should resemble the following: +``` +/opt/ +├── software-discovery-tool-deploy/ # Deployment repository +│ ├── software-discovery-tool/ # Main repository (submodule) +│ └── data/ # Data repository (submodule) +└── software-discovery-tool/ # Symbolic link to the Software Discovery Tool directory +``` + + +# How To Deploy +The whole SDT deployment is maintained by: +- [cicd.yml](https://github.com/rachejazz/software-discovery-tool-deploy/blob/main/.github/workflows/cicd.yml) workflow +- [config_build.py](https://github.com/openmainframeproject/software-discovery-tool/blob/master/bin/config_build.py) to create new sections in the distro config file +- [package_build.py](https://github.com/openmainframeproject/software-discovery-tool/blob/master/bin/package_build.py) to update existing distro files to latest versions + +# Contribute to the deployment workflow + +## Contribute to deployment script +The deployment uses [appleboy's ssh workflow](https://github.com/appleboy/ssh-action) +The deployment is thus triggered at every new pusb into the main branch. +The script section uses the required server credentials to be able to host the tool. +```yml +script: | + cd /opt/software-discovery-tool-deploy + sudo chown -R sdtuser . + git checkout main + git pull origin main --recurse-submodules + sudo cp -u -r software-discovery-tool/ ../software-discovery-tool/ + [cicd.yml](https://github.com/rachejazz/software-discovery-tool-deploy/blob/main/.github/workflows/cicd.yml) +``` +It includes +- Pulling the latest changes +- Copies the contents to the main directory +- Uses config_build.py to check for new data files +- Uses package_build.py to update the existing files with the recent pkg versions +- Restart the server + +## Contribute to package_build.py +The binary has separate methods to extract data from Linux Distributions and [PDS](). +Check [SDT-data]() repo to find out the distro list we support. + +## Contribute to config_build.py +This file controls the `supported_distro.py` file that resides inside `src/config` directory. +It checks for any new data file inside `distro_files` directory and adds it's mapping to the `supported_distro.py`. +Any existing data file from PDS is updated from upstream. + + +_NOTE_ +Any contribution to the binary should be done in the main repository. + +# Report bugs and issues +Feel free to add new issues or features that you would like SDT to support. +Bugs are given high priority since this is an active project used by users of IBM zSystems and LinuxONE . + +For deployment improvements, use this repository. +For new feature request to SDT, use the [main repository](https://github.com/openmainframeproject/software-discovery-tool). +For new data files request, use the [data repository](https://github.com/openmainframeproject/software-discovery-tool-data). + +Appreciating all the contributions that you do for the Open Mainframe Project. From a744bc606f7879a82a513ce9490f91c35dcb7866 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 16:38:52 +0100 Subject: [PATCH 13/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index de57bf2..479f42b 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -9,11 +9,11 @@ jobs: - name: ssh and git module update uses: appleboy/ssh-action@master with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - script: | - cd /opt/software-discovery-tool-deploy - git pull --recurse-submodules - git submodule update --remote --recursive - git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" +# host: ${{ secrets.HOST }} +# username: ${{ secrets.USERNAME }} +# key: ${{ secrets.KEY }} + script: echo hi +# cd /opt/software-discovery-tool-deploy +# git pull --recurse-submodules +# git submodule update --remote --recursive +# git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" From ab0cbf4317ef2b5d28c3658aab03dc1a78e821d1 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 16:48:26 +0100 Subject: [PATCH 14/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 479f42b..cfc1214 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -1,4 +1,4 @@ -name: Sync submodules +name: Sync Submodules on: workflow_dispatch jobs: From a16d60da8308ad291b889a60bf50d900027036d3 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 16:55:40 +0100 Subject: [PATCH 15/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index cfc1214..c1cecb6 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -9,9 +9,9 @@ jobs: - name: ssh and git module update uses: appleboy/ssh-action@master with: -# host: ${{ secrets.HOST }} -# username: ${{ secrets.USERNAME }} -# key: ${{ secrets.KEY }} + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} script: echo hi # cd /opt/software-discovery-tool-deploy # git pull --recurse-submodules From 3f8c804fa39d9a86e0d6bf4e8157fb5d335cc5c8 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 17:05:24 +0100 Subject: [PATCH 16/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index c1cecb6..c4054e3 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -12,8 +12,8 @@ jobs: host: ${{ secrets.HOST }} username: ${{ secrets.USERNAME }} key: ${{ secrets.KEY }} - script: echo hi -# cd /opt/software-discovery-tool-deploy -# git pull --recurse-submodules -# git submodule update --remote --recursive -# git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" + script: | + cd /opt/software-discovery-tool-deploy + git pull --recurse-submodules + git submodule update --remote --recursive + git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" From 7b74a3168b96fd36a2aa525ddf298b12e860db63 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 17:06:37 +0100 Subject: [PATCH 17/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index c4054e3..c6e38f5 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -13,7 +13,7 @@ jobs: username: ${{ secrets.USERNAME }} key: ${{ secrets.KEY }} script: | - cd /opt/software-discovery-tool-deploy + cd /opt/software-discovery-tool-deploy git pull --recurse-submodules git submodule update --remote --recursive git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" From 53f87f76b5d1813132da6cc2b792e259e21e9c18 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 17:22:18 +0100 Subject: [PATCH 18/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index c6e38f5..8d152ab 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -16,4 +16,4 @@ jobs: cd /opt/software-discovery-tool-deploy git pull --recurse-submodules git submodule update --remote --recursive - git commit -sam "Auto updated submodule references" && git push || echo "No changes to commit" + git commit -sam "Auto updated submodule references" && git push origin submodule-updated-"$(date +%s)" || echo "No changes to commit" From 10e7f054e610922f303dadc5aedfb6287c1aebde Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 17:32:29 +0100 Subject: [PATCH 19/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 8d152ab..4ce4e35 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -14,6 +14,7 @@ jobs: key: ${{ secrets.KEY }} script: | cd /opt/software-discovery-tool-deploy + git checkout -b $(date +%b%d)" git pull --recurse-submodules git submodule update --remote --recursive - git commit -sam "Auto updated submodule references" && git push origin submodule-updated-"$(date +%s)" || echo "No changes to commit" + git commit -sam "Auto updated submodule references" && git push origin "$(date +%b%d)" || echo "No changes to commit" From c6fe57dba1d7639cf3f3549265f07b403358e53b Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 17:33:27 +0100 Subject: [PATCH 20/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 4ce4e35..2fd9754 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -14,7 +14,7 @@ jobs: key: ${{ secrets.KEY }} script: | cd /opt/software-discovery-tool-deploy - git checkout -b $(date +%b%d)" + git checkout -b "$(date +%b%d)" git pull --recurse-submodules git submodule update --remote --recursive git commit -sam "Auto updated submodule references" && git push origin "$(date +%b%d)" || echo "No changes to commit" From f589873f1d9a65ea405a622b5ccaf0789af7c313 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 17:37:30 +0100 Subject: [PATCH 21/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 2fd9754..6c8565d 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -15,6 +15,6 @@ jobs: script: | cd /opt/software-discovery-tool-deploy git checkout -b "$(date +%b%d)" - git pull --recurse-submodules + git pull --recurse-submodules origin main git submodule update --remote --recursive git commit -sam "Auto updated submodule references" && git push origin "$(date +%b%d)" || echo "No changes to commit" From 232ce1739f2f98de8f4315c8c244206c7d640d08 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 17:47:26 +0100 Subject: [PATCH 22/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 6c8565d..85547d3 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -17,4 +17,5 @@ jobs: git checkout -b "$(date +%b%d)" git pull --recurse-submodules origin main git submodule update --remote --recursive - git commit -sam "Auto updated submodule references" && git push origin "$(date +%b%d)" || echo "No changes to commit" + git remote add update https://${{ secrets.SDT_USER_PUSH }}:{{ secrets.SDT_PAT_PUSH }}@github.com/openmainframeproject/software-discovery-tool-deploy.git + git commit -sam "Auto updated submodule references" && git push update "$(date +%b%d)" || echo "No changes to commit" From 8a927a43c616fc02bf37625529d8a6dab02aa024 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 17:56:53 +0100 Subject: [PATCH 23/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 85547d3..97034d2 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -17,5 +17,5 @@ jobs: git checkout -b "$(date +%b%d)" git pull --recurse-submodules origin main git submodule update --remote --recursive - git remote add update https://${{ secrets.SDT_USER_PUSH }}:{{ secrets.SDT_PAT_PUSH }}@github.com/openmainframeproject/software-discovery-tool-deploy.git - git commit -sam "Auto updated submodule references" && git push update "$(date +%b%d)" || echo "No changes to commit" + git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:{{ secrets.SDT_PAT_PUSH }}@github.com/openmainframeproject/software-discovery-tool-deploy.git + git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" From 8ffae0055342f51ce0dba715d57488a7edde1956 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 17:59:24 +0100 Subject: [PATCH 24/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 97034d2..0ccc308 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -17,5 +17,5 @@ jobs: git checkout -b "$(date +%b%d)" git pull --recurse-submodules origin main git submodule update --remote --recursive - git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:{{ secrets.SDT_PAT_PUSH }}@github.com/openmainframeproject/software-discovery-tool-deploy.git + git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/openmainframeproject/software-discovery-tool-deploy.git git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" From 13713bd8c696108f38d06b43e7adff2ed5d9a07a Mon Sep 17 00:00:00 2001 From: rachejazz Date: Thu, 23 May 2024 18:18:13 +0100 Subject: [PATCH 25/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 0ccc308..4acea91 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -17,5 +17,5 @@ jobs: git checkout -b "$(date +%b%d)" git pull --recurse-submodules origin main git submodule update --remote --recursive - git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/openmainframeproject/software-discovery-tool-deploy.git + git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/rachejazz/software-discovery-tool-deploy.git git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" From 29aa93bac37a67a6fa6b83e6a63c550e2a14a2ce Mon Sep 17 00:00:00 2001 From: rachejazz Date: Sat, 25 May 2024 00:47:32 +0000 Subject: [PATCH 26/36] updated submodule Signed-off-by: rachejazz --- software-discovery-tool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software-discovery-tool b/software-discovery-tool index 7b00cf1..b487fff 160000 --- a/software-discovery-tool +++ b/software-discovery-tool @@ -1 +1 @@ -Subproject commit 7b00cf14b9affbb3818ea05723ef47ec0684d15b +Subproject commit b487fff3a9841a614954f8ec1806882bead6ea7b From 0efafe22786f4dd25a7211ffe341ac5d06b42302 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Sat, 25 May 2024 02:55:32 +0100 Subject: [PATCH 27/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 8 ++++++-- software-discovery-tool | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 4acea91..618e10e 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -15,7 +15,11 @@ jobs: script: | cd /opt/software-discovery-tool-deploy git checkout -b "$(date +%b%d)" - git pull --recurse-submodules origin main - git submodule update --remote --recursive +# git pull --recurse-submodules origin main +# git submodule update --remote --recursive + cd /opt/software-discovery-tool + git pull origin master + cd /opt/software-discovery-tool + git remote remove git_update git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/rachejazz/software-discovery-tool-deploy.git git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" diff --git a/software-discovery-tool b/software-discovery-tool index b487fff..7b00cf1 160000 --- a/software-discovery-tool +++ b/software-discovery-tool @@ -1 +1 @@ -Subproject commit b487fff3a9841a614954f8ec1806882bead6ea7b +Subproject commit 7b00cf14b9affbb3818ea05723ef47ec0684d15b From b8439c8c67fc84376cc4c39cb14ecc92589a4a5d Mon Sep 17 00:00:00 2001 From: rachejazz Date: Sat, 25 May 2024 03:00:22 +0100 Subject: [PATCH 28/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 618e10e..1decc04 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -13,13 +13,14 @@ jobs: username: ${{ secrets.USERNAME }} key: ${{ secrets.KEY }} script: | - cd /opt/software-discovery-tool-deploy - git checkout -b "$(date +%b%d)" + echo hi +# cd /opt/software-discovery-tool-deploy +# git checkout -b "$(date +%b%d)" # git pull --recurse-submodules origin main # git submodule update --remote --recursive - cd /opt/software-discovery-tool - git pull origin master - cd /opt/software-discovery-tool - git remote remove git_update - git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/rachejazz/software-discovery-tool-deploy.git - git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" +# cd /opt/software-discovery-tool +# git pull origin master +# cd /opt/software-discovery-tool +# git remote remove git_update +# git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/rachejazz/software-discovery-tool-deploy.git +# git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" From 51df4456152a36201f86bbed381d115135c41c88 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Sat, 25 May 2024 03:02:40 +0100 Subject: [PATCH 29/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 1decc04..eef8c46 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -13,14 +13,14 @@ jobs: username: ${{ secrets.USERNAME }} key: ${{ secrets.KEY }} script: | - echo hi -# cd /opt/software-discovery-tool-deploy -# git checkout -b "$(date +%b%d)" +# echo hi + cd /opt/software-discovery-tool-deploy + git checkout -b "$(date +%b%d)" # git pull --recurse-submodules origin main # git submodule update --remote --recursive -# cd /opt/software-discovery-tool -# git pull origin master -# cd /opt/software-discovery-tool -# git remote remove git_update -# git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/rachejazz/software-discovery-tool-deploy.git -# git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" + cd /opt/software-discovery-tool + git pull origin master + cd /opt/software-discovery-tool + git remote remove git_update + git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/rachejazz/software-discovery-tool-deploy.git + git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" From 8888fbc39e7632ff3b9b79331768b72fad7a61e0 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Sat, 25 May 2024 03:04:40 +0100 Subject: [PATCH 30/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index eef8c46..6cc46b6 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -13,12 +13,10 @@ jobs: username: ${{ secrets.USERNAME }} key: ${{ secrets.KEY }} script: | -# echo hi cd /opt/software-discovery-tool-deploy git checkout -b "$(date +%b%d)" -# git pull --recurse-submodules origin main -# git submodule update --remote --recursive cd /opt/software-discovery-tool + git checkout master git pull origin master cd /opt/software-discovery-tool git remote remove git_update From 3bc6f9fbd8402241e40c44ed2b16a78468d66762 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Sat, 25 May 2024 03:07:07 +0100 Subject: [PATCH 31/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 6cc46b6..c444e5e 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -15,10 +15,10 @@ jobs: script: | cd /opt/software-discovery-tool-deploy git checkout -b "$(date +%b%d)" - cd /opt/software-discovery-tool + cd /opt/software-discovery-tool-deploy/software-discovery-tool git checkout master git pull origin master - cd /opt/software-discovery-tool + cd /opt/software-discovery-tool-deploy git remote remove git_update git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/rachejazz/software-discovery-tool-deploy.git git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" From 1592d25e591547e83ed5790695a23f1103a1ee32 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Sat, 25 May 2024 03:38:29 +0100 Subject: [PATCH 32/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index c444e5e..59a5be0 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -14,11 +14,25 @@ jobs: key: ${{ secrets.KEY }} script: | cd /opt/software-discovery-tool-deploy - git checkout -b "$(date +%b%d)" + git checkout -b submodule-update cd /opt/software-discovery-tool-deploy/software-discovery-tool git checkout master git pull origin master cd /opt/software-discovery-tool-deploy git remote remove git_update git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/rachejazz/software-discovery-tool-deploy.git - git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" + git commit -sam "Auto updated submodule references" && git push git_update submodule-update || echo "No changes to commit" + + - name: Create Pull Request + id: cpr + uses: peter-evans/create-pull-request@v6 + with: + token: ${{ secrets.SDT_PAT_PUSH }} + commit-message: submodule update + author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> + signoff: true + branch: submodule-update + delete-branch: true + title: '[Automated] Submodule update' + reviewers: rachejazz + draft: false From 0e6bdfb1e06f17283450e88baacffbe0c0bbddb2 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Sat, 25 May 2024 03:46:33 +0100 Subject: [PATCH 33/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 59a5be0..112fdef 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -27,6 +27,7 @@ jobs: id: cpr uses: peter-evans/create-pull-request@v6 with: + pull-request-url: https://github.com/rachejazz/software-discovery-tool-deploy/ token: ${{ secrets.SDT_PAT_PUSH }} commit-message: submodule update author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> From 04621e292a914b79661372ba2e97ee9c58314896 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Sat, 25 May 2024 03:52:40 +0100 Subject: [PATCH 34/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index 112fdef..c444e5e 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -14,26 +14,11 @@ jobs: key: ${{ secrets.KEY }} script: | cd /opt/software-discovery-tool-deploy - git checkout -b submodule-update + git checkout -b "$(date +%b%d)" cd /opt/software-discovery-tool-deploy/software-discovery-tool git checkout master git pull origin master cd /opt/software-discovery-tool-deploy git remote remove git_update git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/rachejazz/software-discovery-tool-deploy.git - git commit -sam "Auto updated submodule references" && git push git_update submodule-update || echo "No changes to commit" - - - name: Create Pull Request - id: cpr - uses: peter-evans/create-pull-request@v6 - with: - pull-request-url: https://github.com/rachejazz/software-discovery-tool-deploy/ - token: ${{ secrets.SDT_PAT_PUSH }} - commit-message: submodule update - author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> - signoff: true - branch: submodule-update - delete-branch: true - title: '[Automated] Submodule update' - reviewers: rachejazz - draft: false + git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" From 6ef31a301b056c5e4a7454f1a881b565953801b6 Mon Sep 17 00:00:00 2001 From: rachejazz Date: Sat, 25 May 2024 04:03:02 +0100 Subject: [PATCH 35/36] auto sync with main repo Signed-off-by: rachejazz --- .github/workflows/updatesubmodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatesubmodules.yml b/.github/workflows/updatesubmodules.yml index c444e5e..abceb4d 100644 --- a/.github/workflows/updatesubmodules.yml +++ b/.github/workflows/updatesubmodules.yml @@ -20,5 +20,5 @@ jobs: git pull origin master cd /opt/software-discovery-tool-deploy git remote remove git_update - git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/rachejazz/software-discovery-tool-deploy.git + git remote add git_update https://${{ secrets.SDT_USER_PUSH }}:${{ secrets.SDT_PAT_PUSH }}@github.com/openmainframeproject/software-discovery-tool-deploy.git git commit -sam "Auto updated submodule references" && git push git_update "$(date +%b%d)" || echo "No changes to commit" From 82c36c3dd17582e1de6ec48730ca289c2bbe1efc Mon Sep 17 00:00:00 2001 From: rachejazz Date: Sat, 25 May 2024 04:18:08 +0100 Subject: [PATCH 36/36] Revert "Create CONTRIBUTE.md" This reverts commit 329118e5cea0099212dd7303953571a5e255578c. Signed-off-by: rachejazz --- docs/CONTRIBUTE.md | 55 ---------------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 docs/CONTRIBUTE.md diff --git a/docs/CONTRIBUTE.md b/docs/CONTRIBUTE.md deleted file mode 100644 index c66371a..0000000 --- a/docs/CONTRIBUTE.md +++ /dev/null @@ -1,55 +0,0 @@ -This repository is the deployed version of the main repository of Software Discovery Tool as a submodule and the data repository as a sub submodule. -Any contribution to SDT should be done in the main repository. - -# How To Deploy -The whole SDT deployment is maintained by: -- [cicd.yml]() workflow -- [config_build.py]() to create new sections in the distro config file -- [package_build.py]() to update existing distro files to latest versions - -# Contribute to the deployment workflow - -## Contribute to deployment script -The deployment uses [appleboy's ssh workflow](https://github.com/appleboy/ssh-action) -The deployment is thus triggered at every new pusb into the main branch. -The script section uses the required server credentials to be able to host the tool. -```yml -script: | - cd /opt/software-discovery-tool-deploy - sudo chown -R sdtuser . - git checkout main - git pull origin main --recurse-submodules - sudo cp -u -r software-discovery-tool/ ../software-discovery-tool/ - sudo chown -R apache:apache /opt/software-discovery-tool - sudo -u apache /opt/software-discovery-tool/bin/config_build.py - sudo apachectl restart -``` -It includes -- Pulling the latest changes -- Copies the contents to the main directory -- Uses config_build.py to check for new data files -- Uses package_build.py to update the existing files with the recent pkg versions -- Restart the server - -## Contribute to package_build.py -The binary has separate methods to extract data from Linux Distributions and [PDS](). -Check [SDT-data]() repo to find out the distro list we support. - -## Contribute to config_build.py -This file controls the `supported_distro.py` file that resides inside `src/config` directory. -It checks for any new data file inside `distro_files` directory and adds it's mapping to the `supported_distro.py`. -Any existing data file from PDS is updated from upstream. - - -_NOTE_ -Any contribution to the binary should be done in the main repository. - -# Report bugs and issues -Feel free to add new issues or features that you would like SDT to support. -Bugs are given high priority since this is an active project used by users of Z Systems. - -For deployment improvements, use this repository. -For new feature request to SDT, use the main repository. -For new data files request, use the data repository. - -Appreciating all the contributions that you do for the Open Mainframe Project.