Skip to content

Commit

Permalink
Merge branch 'main' into issue227
Browse files Browse the repository at this point in the history
  • Loading branch information
Alan-Jowett committed May 28, 2024
2 parents 1df24b9 + 032f730 commit b9b489a
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 18 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
submodules: 'recursive'

Expand All @@ -56,8 +56,8 @@ jobs:
libelf-dev \
lcov
- name: Install prerequisites - macos-11
if: inputs.platform == 'macos-11'
- name: Install prerequisites - macos-latest
if: inputs.platform == 'macos-latest'
run: |
brew install \
cmake \
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
- name: Configure CMake
if: inputs.platform == 'ubuntu-latest' || inputs.platform == 'macos-11'
if: inputs.platform == 'ubuntu-latest' || inputs.platform == 'macos-latest'
run: |
if [ "${{inputs.enable_sanitizers}}" = "true" ]; then
export SANITIZER_FLAGS="-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
- name: Coveralls Parallel
if: inputs.enable_coverage == true
uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # v2.2.3
uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 # v2.3.0
with:
github-token: ${{ secrets.github_token }}
flag-name: run-${{inputs.build_type}}-${{inputs.platform}}-${{inputs.arch}}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ jobs:
macos_release:
uses: ./.github/workflows/Build.yml
with:
platform: macos-11
platform: macos-latest
configuration: Release

macos_debug:
uses: ./.github/workflows/Build.yml
with:
platform: macos-11
platform: macos-latest
configuration: Debug

finish:
Expand All @@ -130,7 +130,7 @@ jobs:
egress-policy: audit

- name: Coveralls Finished
uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # v2.2.3
uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 # v2.3.0
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ jobs:
egress-policy: audit

- name: Checkout repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
submodules: 'recursive'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -82,7 +82,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
uses: github/codeql-action/autobuild@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -95,6 +95,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
with:
category: "/language:${{matrix.language}}"
4 changes: 2 additions & 2 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ jobs:
egress-policy: audit

- name: 'Checkout Repository'
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- name: 'Dependency Review'
uses: actions/dependency-review-action@5bbc3ba658137598168acb2ab73b21c432dd411b # v4.2.5
uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2
6 changes: 3 additions & 3 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ jobs:
egress-policy: audit

- name: "Checkout code"
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
with:
results_file: results.sarif
results_format: sarif
Expand Down Expand Up @@ -71,6 +71,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion Docker/Windows/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation
# SPDX-License-Identifier: MIT

FROM mcr.microsoft.com/windows/nanoserver:ltsc2019@sha256:9118c25a81609f13b441411f006b7cb6dd50958303e228f53914bebd8056d2e1
FROM mcr.microsoft.com/windows/nanoserver:ltsc2019@sha256:6f62243adf70b086613cb4b4596c276fe73bab1e5152037eb5b156c915886be8

WORKDIR /app

Expand Down
10 changes: 10 additions & 0 deletions tests/le16-high.data
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Copyright (c) Microsoft Corporation
# SPDX-License-Identifier: MIT
-- asm
ldxdw %r0, [%r1]
le16 %r0
exit
-- mem
22 11 00 FF EE DD CC BB AA
-- result
0x1122
10 changes: 10 additions & 0 deletions tests/le32-high.data
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Copyright (c) Microsoft Corporation
# SPDX-License-Identifier: MIT
-- asm
ldxdw %r0, [%r1]
le32 %r0
exit
-- mem
44 33 22 11 00 FF EE DD
-- result
0x11223344

0 comments on commit b9b489a

Please sign in to comment.