From 11a25a9ce278b44de7e25f64e5c8b16f36281e8f Mon Sep 17 00:00:00 2001 From: rv0lt Date: Tue, 4 Jun 2024 12:13:41 +0200 Subject: [PATCH 1/5] update actions due to broken pipeline --- .github/workflows/release-cli.yml | 45 ++++++++++++++++--------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 47408ad7..ce101684 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -6,10 +6,11 @@ --- name: New Release on: - release: - types: [published] - branches: - - "master" + push: +# release: +# types: [published] +# branches: +# - "master" jobs: build-n-publish: runs-on: ubuntu-latest @@ -31,23 +32,23 @@ jobs: - name: Build the distribution run: python setup.py sdist bdist_wheel - - name: Publish dist to TestPyPI - if: github.repository == 'ScilifelabDataCentre/dds_cli' - uses: pypa/gh-action-pypi-publish@release/v1 - with: - print-hash: true - password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository-url: https://test.pypi.org/legacy/ - skip-existing: true + #- name: Publish dist to TestPyPI + # if: github.repository == 'ScilifelabDataCentre/dds_cli' + # uses: pypa/gh-action-pypi-publish@release/v1 + # with: + # print-hash: true + # password: ${{ secrets.TEST_PYPI_API_TOKEN }} + # repository-url: https://test.pypi.org/legacy/ + # skip-existing: true - - name: Publish dist to PyPI - if: github.repository == 'ScilifelabDataCentre/dds_cli' - uses: pypa/gh-action-pypi-publish@release/v1 - with: - print-hash: true - user: __token__ - password: ${{ secrets.pypi_password }} - skip-existing: true + #- name: Publish dist to PyPI + # if: github.repository == 'ScilifelabDataCentre/dds_cli' + # uses: pypa/gh-action-pypi-publish@release/v1 + # with: + # print-hash: true + # user: __token__ + # password: ${{ secrets.pypi_password }} + # skip-existing: true ddsclibinaries: name: Build binary packages for the DDS CLI @@ -56,7 +57,7 @@ jobs: strategy: matrix: include: - - os: macos-latest + - os: macos-13 TARGET: MacOs_x86_64 CMD_BUILD: > pyinstaller -F -c -n dds_cli_macos_x86_64 -i resources/scilifelab.icns @@ -139,7 +140,7 @@ jobs: uses: matthiaszepper/sphinx-action-v4@pdflatex with: container: pdflatex - pre-build-command: "apt-get update && apt-get install -y librsvg2-bin" + pre-build-command: "apt-get update && apt-get install -y librsvg2-bin && apt-get -y install build-essential" build-command: "make latexpdf" docs-folder: "docs/" - name: Create an artifact of the previously built HTML From 4431f446c6aa231a0209c168c32c1b4f220f27b5 Mon Sep 17 00:00:00 2001 From: rv0lt Date: Tue, 4 Jun 2024 12:17:52 +0200 Subject: [PATCH 2/5] remove uploads --- .github/workflows/release-cli.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index ce101684..2706e245 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -109,16 +109,16 @@ jobs: - name: Test the executable run: | ./dist/${{ matrix.OUT_FILE_NAME}} --version - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./dist/${{ matrix.OUT_FILE_NAME}} - asset_name: ${{ matrix.OUT_FILE_NAME}} - asset_content_type: ${{ matrix.ASSET_MIME}} + #- name: Upload Release Asset + # id: upload-release-asset + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ github.event.release.upload_url }} + # asset_path: ./dist/${{ matrix.OUT_FILE_NAME}} + # asset_name: ${{ matrix.OUT_FILE_NAME}} + # asset_content_type: ${{ matrix.ASSET_MIME}} ddsclidocumentation: name: Build the DDS CLI Documentation From f13a416db680da0276a5cd65f71b1423a7af55c6 Mon Sep 17 00:00:00 2001 From: rv0lt Date: Tue, 4 Jun 2024 12:38:13 +0200 Subject: [PATCH 3/5] no release for testing --- .github/workflows/release-cli.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 2706e245..1187cfdd 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -153,12 +153,12 @@ jobs: with: name: Documentation path: docs/_build/latex/datadeliverysystem.pdf - - name: Upload Release Asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: docs/_build/latex/datadeliverysystem.pdf - asset_name: dds_cli_user_manual.pdf - asset_content_type: application/pdf + # - name: Upload Release Asset + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ github.event.release.upload_url }} + # asset_path: docs/_build/latex/datadeliverysystem.pdf + # asset_name: dds_cli_user_manual.pdf + # asset_content_type: application/pdf From ce2d779a7558666bc93aa05ea6d15b454a9f0d70 Mon Sep 17 00:00:00 2001 From: rv0lt Date: Tue, 4 Jun 2024 12:44:45 +0200 Subject: [PATCH 4/5] revert changes after fixing testing --- .github/workflows/release-cli.yml | 79 +++++++++++++++---------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 1187cfdd..5184afa2 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -6,11 +6,10 @@ --- name: New Release on: - push: -# release: -# types: [published] -# branches: -# - "master" + release: + types: [published] + branches: + - "master" jobs: build-n-publish: runs-on: ubuntu-latest @@ -32,23 +31,23 @@ jobs: - name: Build the distribution run: python setup.py sdist bdist_wheel - #- name: Publish dist to TestPyPI - # if: github.repository == 'ScilifelabDataCentre/dds_cli' - # uses: pypa/gh-action-pypi-publish@release/v1 - # with: - # print-hash: true - # password: ${{ secrets.TEST_PYPI_API_TOKEN }} - # repository-url: https://test.pypi.org/legacy/ - # skip-existing: true + - name: Publish dist to TestPyPI + if: github.repository == 'ScilifelabDataCentre/dds_cli' + uses: pypa/gh-action-pypi-publish@release/v1 + with: + print-hash: true + password: ${{ secrets.TEST_PYPI_API_TOKEN }} + repository-url: https://test.pypi.org/legacy/ + skip-existing: true - #- name: Publish dist to PyPI - # if: github.repository == 'ScilifelabDataCentre/dds_cli' - # uses: pypa/gh-action-pypi-publish@release/v1 - # with: - # print-hash: true - # user: __token__ - # password: ${{ secrets.pypi_password }} - # skip-existing: true + - name: Publish dist to PyPI + if: github.repository == 'ScilifelabDataCentre/dds_cli' + uses: pypa/gh-action-pypi-publish@release/v1 + with: + print-hash: true + user: __token__ + password: ${{ secrets.pypi_password }} + skip-existing: true ddsclibinaries: name: Build binary packages for the DDS CLI @@ -109,16 +108,16 @@ jobs: - name: Test the executable run: | ./dist/${{ matrix.OUT_FILE_NAME}} --version - #- name: Upload Release Asset - # id: upload-release-asset - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ github.event.release.upload_url }} - # asset_path: ./dist/${{ matrix.OUT_FILE_NAME}} - # asset_name: ${{ matrix.OUT_FILE_NAME}} - # asset_content_type: ${{ matrix.ASSET_MIME}} + - name: Upload Release Asset + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: ./dist/${{ matrix.OUT_FILE_NAME}} + asset_name: ${{ matrix.OUT_FILE_NAME}} + asset_content_type: ${{ matrix.ASSET_MIME}} ddsclidocumentation: name: Build the DDS CLI Documentation @@ -153,12 +152,12 @@ jobs: with: name: Documentation path: docs/_build/latex/datadeliverysystem.pdf - # - name: Upload Release Asset - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ github.event.release.upload_url }} - # asset_path: docs/_build/latex/datadeliverysystem.pdf - # asset_name: dds_cli_user_manual.pdf - # asset_content_type: application/pdf + - name: Upload Release Asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: docs/_build/latex/datadeliverysystem.pdf + asset_name: dds_cli_user_manual.pdf + asset_content_type: application/pdf From 9778797d4920a55f4af707b25fdd9a5e629d1c64 Mon Sep 17 00:00:00 2001 From: rv0lt Date: Tue, 4 Jun 2024 12:46:25 +0200 Subject: [PATCH 5/5] sprintlog2 --- SPRINTLOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SPRINTLOG.md b/SPRINTLOG.md index 59fc9302..d86651ed 100644 --- a/SPRINTLOG.md +++ b/SPRINTLOG.md @@ -355,3 +355,4 @@ _Empty sprint_ - Update requests to solve CVE ([#690](https://github.com/ScilifelabDataCentre/dds_cli/pull/690)) - Update docs for Testing instance migration, including removing use of 'dev' ([#691](https://github.com/ScilifelabDataCentre/dds_cli/pull/691)) - Fix GitHub Pages action, that broke due to update in the action's image ([#695](https://github.com/ScilifelabDataCentre/dds_cli/pull/695)) +- Fix Action that builds the executable files due to update in MacOs default architecture ([#700](https://github.com/ScilifelabDataCentre/dds_cli/pull/700)