diff --git a/.github/workflows/build-debian9.yml b/.github/workflows/build-debian11.yml similarity index 67% rename from .github/workflows/build-debian9.yml rename to .github/workflows/build-debian11.yml index 7564daf5..3c0f35e7 100644 --- a/.github/workflows/build-debian9.yml +++ b/.github/workflows/build-debian11.yml @@ -1,10 +1,10 @@ -name: Debian9 Build Job +name: Debian11 Build Job on: [push, pull_request] jobs: build: - name: Build on Debian9 + name: Build on Debian11 runs-on: ubuntu-latest steps: @@ -14,6 +14,7 @@ jobs: submodules: recursive - name: Build LTFS id: build - uses: LinearTapeFileSystem/Debian9-Build@v1.0 + uses: LinearTapeFileSystem/Debian11-Build@v1.1.1 with: destination: '/tmp/ltfs' + submodules: recursive diff --git a/.github/workflows/build-debian10.yml b/.github/workflows/build-debian12.yml similarity index 67% rename from .github/workflows/build-debian10.yml rename to .github/workflows/build-debian12.yml index 5da6a99b..395cdf81 100644 --- a/.github/workflows/build-debian10.yml +++ b/.github/workflows/build-debian12.yml @@ -1,10 +1,10 @@ -name: Debian10 Build Job +name: Debian12 Build Job on: [push, pull_request] jobs: build: - name: Build on Debian10 + name: Build on Debian12 runs-on: ubuntu-latest steps: @@ -14,6 +14,7 @@ jobs: submodules: recursive - name: Build LTFS id: build - uses: LinearTapeFileSystem/Debian10-Build@v1.1 + uses: LinearTapeFileSystem/Debian12-Build@v1.0 with: destination: '/tmp/ltfs' + submodules: recursive diff --git a/.github/workflows/update-uthash.yml b/.github/workflows/update-uthash.yml index 59aaecd1..f4adb134 100644 --- a/.github/workflows/update-uthash.yml +++ b/.github/workflows/update-uthash.yml @@ -8,6 +8,7 @@ on: paths: - '.gitmodules' - 'src/libltfs/uthash_submodule/**' + - '.github/workflows/update-uthash.yml' jobs: update-uthash: @@ -21,7 +22,11 @@ jobs: - name: Update submodule to latest run: | - git submodule update --remote --merge src/libltfs/uthash_submodule + cd src/libltfs/uthash_submodule + git fetch origin + git checkout master || git checkout main + git reset --hard origin/master || git reset --hard origin/main + cd ../../.. git add src/libltfs/uthash_submodule - name: Check for changes