From deb64c2cdc5ffb02172041751b90630e888a05dd Mon Sep 17 00:00:00 2001 From: Henil Panchal Date: Sun, 24 Mar 2024 23:52:13 +0530 Subject: [PATCH 1/8] fix: interim fix for v0.10.1 --- .github/workflows/security_checks.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/security_checks.yml b/.github/workflows/security_checks.yml index 14d92b76..9e7512f0 100644 --- a/.github/workflows/security_checks.yml +++ b/.github/workflows/security_checks.yml @@ -18,7 +18,8 @@ jobs: - uses: fortran-lang/setup-fpm@v5 with: - github-token: ${{ secrets.GITHUB_TOKEN }} + fpm-version: 'v0.10.1' + github-token: ${{ secrets.GITHUB_TOKEN }} - name: Setup Python uses: actions/setup-python@v5 From e4568b1f867af9220a49ba328a07a98fb984ecb7 Mon Sep 17 00:00:00 2001 From: Henil Panchal Date: Mon, 25 Mar 2024 11:56:00 +0530 Subject: [PATCH 2/8] fix: rendering --- frontend/src/components/packageItem.js | 2 +- frontend/src/pages/package.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/packageItem.js b/frontend/src/components/packageItem.js index 543064d6..554cc7e7 100644 --- a/frontend/src/components/packageItem.js +++ b/frontend/src/components/packageItem.js @@ -63,7 +63,7 @@ const PackageItem = ({ packageEntity }) => { diff --git a/frontend/src/pages/package.js b/frontend/src/pages/package.js index 588d452c..ccada3ac 100644 --- a/frontend/src/pages/package.js +++ b/frontend/src/pages/package.js @@ -255,7 +255,7 @@ const sideBar = (data, setShowReportForm) => { return (

Install (add to fpm.toml)

-

{data.name} = {"{"}{"'namespace'"}: {"'"}{data.namespace}{"'}"}

+

{data.name} = {"{"}{"'namespace'"}={"'"}{data.namespace}{"'}"}

Repository

{data.repository} From 3a3b3905cef8537141b1c0c78b9f4063771564a8 Mon Sep 17 00:00:00 2001 From: Henil Panchal Date: Mon, 25 Mar 2024 12:01:14 +0530 Subject: [PATCH 3/8] fix: verification --- .github/workflows/security_checks.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/security_checks.yml b/.github/workflows/security_checks.yml index 9e7512f0..26e914ec 100644 --- a/.github/workflows/security_checks.yml +++ b/.github/workflows/security_checks.yml @@ -27,6 +27,9 @@ jobs: - name: Install python libraries run: pip3 install --user -r backend/requirements.txt + - name: temporary folder for fortran packages + run: cd backend/static && mkdir temp + - name: load env file run: | echo "${{ secrets.ENV_FILE }}" > backend/.env From e817003c51bcd2c9be5ce5c103833f8a1e951cfd Mon Sep 17 00:00:00 2001 From: Henil Panchal Date: Mon, 25 Mar 2024 12:04:52 +0530 Subject: [PATCH 4/8] fix --- backend/validate.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/validate.py b/backend/validate.py index e905e984..7d7d9e2f 100755 --- a/backend/validate.py +++ b/backend/validate.py @@ -64,7 +64,7 @@ def process_package(packagename: str) -> Tuple[bool, Union[dict, None], str]: extract_command = f'tar -xzf static/temp/{packagename}.tar.gz -C static/temp/{packagename}/' run_command(extract_command) - generate_model = "fpm build --dump=fpm_model.json" # TODO: interim bug fix, disable after fpm v0.10.2 + generate_model = f"cd static/temp/{packagename} && fpm build --dump=fpm_model.json" # TODO: interim bug fix, disable after fpm v0.10.2 run_command(generate_model) # Read fpm.toml @@ -139,7 +139,10 @@ def validate() -> None: update_data[key] = result[1][key] dependencies = list() - dependencies += [(dependency_info['namespace'],dependency_name) for dependency_name, dependency_info in result[1].get('dependencies', {}).items()] + try: + dependencies += [(dependency_info['namespace'],dependency_name) for dependency_name, dependency_info in result[1].get('dependencies', {}).items()] + except: + pass for section in ['test', 'example', 'executable']: dependencies += collect_dependencies(section, result[1]) From fc6a994425d52abf054eb55ec8a0a6e5ef7fa2cf Mon Sep 17 00:00:00 2001 From: Henil Panchal Date: Mon, 25 Mar 2024 12:11:54 +0530 Subject: [PATCH 5/8] fix --- backend/validate.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/validate.py b/backend/validate.py index 7d7d9e2f..194adccb 100755 --- a/backend/validate.py +++ b/backend/validate.py @@ -144,7 +144,10 @@ def validate() -> None: except: pass for section in ['test', 'example', 'executable']: - dependencies += collect_dependencies(section, result[1]) + try: + dependencies += collect_dependencies(section, result[1]) + except: + pass update_data['dependencies'] = list(set(dependencies)) From 6f0142e4515b58e781aab4b4d9650e34f7a38f26 Mon Sep 17 00:00:00 2001 From: Henil Panchal Date: Mon, 25 Mar 2024 12:44:22 +0530 Subject: [PATCH 6/8] package maintainers should be visible to everyone --- frontend/src/pages/package.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/package.js b/frontend/src/pages/package.js index ccada3ac..b2859f70 100644 --- a/frontend/src/pages/package.js +++ b/frontend/src/pages/package.js @@ -232,7 +232,7 @@ const ViewPackageMaintainersButton = ({ return ( - {isVerified && ( + {

View Package Maintainers

- )} + } ); }; From 27a7242c239391d83adba847d6bdeda68ecc0ff6 Mon Sep 17 00:00:00 2001 From: Henil Panchal Date: Mon, 25 Mar 2024 13:09:28 +0530 Subject: [PATCH 7/8] fix: env var --- .github/workflows/tests.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 35363f6c..033e47a8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,6 +7,18 @@ on: branches: ["main"] workflow_dispatch: +env: + MONGO_DB_NAME: testregistry + MONGO_URI: mongodb://localhost:27017/ + MONGO_USER_NAME: Admin + MONGO_PASSWORD: Admin + SALT: MYSALT + HOST: localhost + RESET_EMAIL: reset@localhost.com + RESET_PASSWORD: reset + SUDO_PASSWORD: fortran + IS_CI: true + jobs: build: runs-on: ubuntu-latest @@ -25,10 +37,6 @@ jobs: - name: Install python libraries run: pip3 install --user -r backend/requirements.txt - - - name: load env file - run: | - echo "${{ secrets.TEST_ENV_FILE }}" > backend/.env - name: Build the Docker image and run tests run: cd backend && python -m unittest discover -s tests \ No newline at end of file From 48c4753fc3b64a721339365060008819e73576a6 Mon Sep 17 00:00:00 2001 From: Henil Panchal Date: Mon, 25 Mar 2024 13:15:03 +0530 Subject: [PATCH 8/8] fix: env var --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 033e47a8..9dfc7dcc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,5 +38,5 @@ jobs: - name: Install python libraries run: pip3 install --user -r backend/requirements.txt - - name: Build the Docker image and run tests + - name: run tests run: cd backend && python -m unittest discover -s tests \ No newline at end of file