diff --git a/.github/actions/testdeps/action.yaml b/.github/actions/testdeps/action.yaml new file mode 100644 index 0000000..f68f5f8 --- /dev/null +++ b/.github/actions/testdeps/action.yaml @@ -0,0 +1,13 @@ +name: Install common test dependencies + +on: # yamllint disable-line rule:truthy + workflow_call: + +runs: + using: "composite" + steps: + - name: Install common test dependencies + shell: bash + run: | + sudo apt update + sudo apt install -y libgpgme-dev libbtrfs-dev libdevmapper-dev podman diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index dbcf372..64a70e9 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -12,20 +12,16 @@ on: # yamllint disable-line rule:truthy types: ["checks_requested"] jobs: - build: runs-on: ubuntu-latest - uses: ./.github/workflows/testdeps.yaml steps: - uses: actions/checkout@v4 - + - uses: ./.github/actions/testdeps - name: Set up Go uses: actions/setup-go@v4 with: go-version: 'stable' - - name: Build run: go build -v ./... - - name: Test run: go test -v ./... diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index 027e96f..bbaf9b0 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -12,8 +12,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - name: Install yamllint - run: sudo apt-get install -y yamllint aspell + - name: Install lint dependencies + run: sudo apt install -y yamllint aspell pre-commit - name: "Clone Repository" uses: actions/checkout@v4 - name: Set up Python @@ -23,13 +23,13 @@ jobs: build: runs-on: ubuntu-latest - uses: ./.github/workflows/testdeps.yaml steps: - uses: actions/checkout@v4 + - uses: ./.github/actions/testdeps - name: Install integration test env run: | sudo apt update - sudo apt install -y pytest golang + sudo apt install -y python3-pytest golang - name: Run integration tests via pytest run: | diff --git a/.github/workflows/testdeps.yaml b/.github/workflows/testdeps.yaml deleted file mode 100644 index 4dbdc5d..0000000 --- a/.github/workflows/testdeps.yaml +++ /dev/null @@ -1,13 +0,0 @@ -name: Install common test dependencies - -on: # yamllint disable-line rule:truthy - workflow_call: - -jobs: - install: - runs-on: ubuntu-latest - steps: - - name: Install common test dependencies - run: | - sudo apt update - sudo apt install -y libgpgme-dev libbtrfs-dev libdevmapper-dev podman