diff options
| -rw-r--r-- | .github/workflows/debian.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/macos.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/openwrt-ci-master.yml | 18 | ||||
| -rw-r--r-- | .github/workflows/openwrt-ci-pull-request.yml | 18 | ||||
| -rw-r--r-- | program.c | 5 |
5 files changed, 28 insertions, 17 deletions
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 1e6be40..52c6f9e 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: path: ucode/ diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 81502d2..6632b48 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -8,7 +8,7 @@ jobs: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup run: | diff --git a/.github/workflows/openwrt-ci-master.yml b/.github/workflows/openwrt-ci-master.yml index 77f2bfc..a342e10 100644 --- a/.github/workflows/openwrt-ci-master.yml +++ b/.github/workflows/openwrt-ci-master.yml @@ -5,6 +5,10 @@ on: branches: - master +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + env: CI_ENABLE_UNIT_TESTING: 1 CI_TARGET_BUILD_DEPENDS: libnl-tiny ubus uci @@ -12,10 +16,10 @@ env: jobs: native_testing: name: Various native checks - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ynezz/gh-actions-openwrt-ci-native@v0.0.2 @@ -31,22 +35,22 @@ jobs: sdk_build: name: Build with OpenWrt ${{ matrix.sdk_platform }} SDK (out of tree) - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: sdk_platform: - ath79-generic - - imx6-generic + - imx-cortexa9 - malta-be - - mvebu-cortexa53 + - mediatek-mt7622 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Out of tree build with OpenWrt ${{ matrix.sdk_platform }} SDK - uses: ynezz/gh-actions-openwrt-ci-sdk@v0.0.1 + uses: ynezz/gh-actions-openwrt-ci-sdk@v0.0.2 env: CI_TARGET_SDK_RELEASE: master CI_TARGET_SDK_IMAGE: ${{ matrix.sdk_platform }} diff --git a/.github/workflows/openwrt-ci-pull-request.yml b/.github/workflows/openwrt-ci-pull-request.yml index e6be980..d33d11a 100644 --- a/.github/workflows/openwrt-ci-pull-request.yml +++ b/.github/workflows/openwrt-ci-pull-request.yml @@ -10,13 +10,17 @@ env: CI_ENABLE_UNIT_TESTING: 1 CI_TARGET_BUILD_DEPENDS: libnl-tiny ubus uci +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: native_testing: name: Various native checks - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ynezz/gh-actions-openwrt-ci-native@v0.0.2 env: @@ -35,22 +39,22 @@ jobs: sdk_build: name: Build with OpenWrt ${{ matrix.sdk_platform }} SDK (out of tree) - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: sdk_platform: - ath79-generic - - imx6-generic + - imx-cortexa9 - malta-be - - mvebu-cortexa53 + - mediatek-mt7622 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Out of tree build with OpenWrt ${{ matrix.sdk_platform }} SDK - uses: ynezz/gh-actions-openwrt-ci-sdk@v0.0.1 + uses: ynezz/gh-actions-openwrt-ci-sdk@v0.0.2 env: CI_TARGET_SDK_RELEASE: master CI_TARGET_SDK_IMAGE: ${{ matrix.sdk_platform }} @@ -587,8 +587,11 @@ read_sourceinfo(uc_source_t *input, uint32_t flags, char **errp, uc_program_t *p return NULL; } - if (!read_size_t(input->fp, &len, sizeof(uint32_t), "sourceinfo code buffer length", errp)) + if (!read_size_t(input->fp, &len, sizeof(uint32_t), "sourceinfo code buffer length", errp)) { + free(path); + return NULL; + } if (len > 0) { code = xalloc(len); |