From fec46eac4bc9cd2fcc8bf74e3ccf06af566672ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Nguyen?= Date: Fri, 28 Jun 2024 12:15:39 +0200 Subject: [PATCH 1/2] Migrate to Amaranth 0.5. --- .github/workflows/main.yaml | 1 + pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 076f72f..5a48f62 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -22,6 +22,7 @@ jobs: - 'pypy-3.10' # this version range needs to be synchronized with the one in pyproject.toml amaranth-version: + - '0.5' - 'git' allow-failure: - false diff --git a/pyproject.toml b/pyproject.toml index 22d910f..761e9ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ license = {file = "LICENSE.txt"} requires-python = "~=3.8" dependencies = [ # this version requirement needs to be synchronized with the one in .github/workflows/main.yml - "amaranth@git+https://github.com/amaranth-lang/amaranth", + "amaranth>=0.5,<0.6", ] [project.urls] From ef46408fc950d561c688d7664c63ba84647d5961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Nguyen?= Date: Fri, 28 Jun 2024 12:16:25 +0200 Subject: [PATCH 2/2] CI: upgrade all Github Actions. --- .github/workflows/main.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 5a48f62..b511c5c 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -30,11 +30,11 @@ jobs: name: 'test (${{ matrix.python-version }}, HDL ${{ matrix.amaranth-version }})' steps: - name: Check out source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up PDM - uses: pdm-project/setup-pdm@v3 + uses: pdm-project/setup-pdm@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -60,14 +60,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Fetch tags from upstream repository run: | git fetch --tags https://github.com/amaranth-lang/amaranth-soc.git - name: Set up PDM - uses: pdm-project/setup-pdm@v3 + uses: pdm-project/setup-pdm@v4 with: python-version: '3.12' - name: Install dependencies @@ -77,7 +77,7 @@ jobs: run: | pdm run document - name: Upload documentation archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: docs path: docs/_build @@ -97,11 +97,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Download documentation archive - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: docs path: docs/ @@ -130,11 +130,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Download documentation archive - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: docs path: pages/docs/${{ github.ref_name }}/