Merge branch 'main' into chore-dd-octo-sts-part2

Author: ypopovych

.github/chainguard/self.github.create-release.workflow-dispatch.sts.yaml

@@ -0,0 +1,12 @@
+# Policy for: .github/workflows/createRelease.yml in DataDog/dd-sdk-swift-testing
+issuer: https://token.actions.githubusercontent.com
+subject: repo:DataDog/dd-sdk-swift-testing:ref:refs/heads/main
+
+claim_pattern:
+  event_name: workflow_dispatch
+  job_workflow_ref: DataDog/dd-sdk-swift-testing/\.github/workflows/createRelease\.yml@refs/heads/main
+  ref: refs/heads/main
+  repository: DataDog/dd-sdk-swift-testing
+
+permissions:
+  contents: write

.github/workflows/codeQL.yml

@@ -17,11 +17,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@603b797f8b14b413fe025cd935a91c16c4782713 # v3.33.0
         with:
           languages: 'swift'
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -33,13 +33,13 @@ jobs:
         run: make build
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@603b797f8b14b413fe025cd935a91c16c4782713 # v3.33.0
         with:
           output: "results"
           upload: "never"
 
       - name: Upload SARIF report to Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: CodeQL Analysis SARIF
           path: ${{ github.workspace }}/results/swift.sarif

.github/workflows/createRelease.yml

@@ -17,14 +17,14 @@ jobs:
     runs-on: macos-14
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
     - name: Select Xcode 16.2
       run: sudo xcode-select --switch /Applications/Xcode_16.2.app
     - name: Test
       run: make XC_LOG=tests IOS_SIMULATOR="iPhone 16" TVOS_SIMULATOR="Apple TV" tests
     - name: Attach Xcode logs
       if: '!cancelled()'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: xcode-tests-logs
         path: "*-tests.log"
@@ -38,13 +38,17 @@ jobs:
       id-token: write
     steps:
     - name: Checkout
+<<<<<<< chore-dd-octo-sts-part2
       uses: actions/checkout@v4
     - name: Get GitHub token via dd-octo-sts
       uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
       id: octo-sts
       with:
         scope: DataDog/dd-sdk-swift-testing
         policy: self.github.create-release.workflow-dispatch
+=======
+      uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+>>>>>>> main
     - name: Select Xcode 16.2
       run: sudo xcode-select --switch /Applications/Xcode_16.2.app
     - name: Build and upload XCFrameworks, create draft release
@@ -53,7 +57,7 @@ jobs:
       run: make XC_LOG=archive version=${{ github.event.inputs.version }} github_release
     - name: Attach Xcode logs
       if: '!cancelled()'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: xcode-archive-logs
         path: "*-archive.log"
@@ -64,7 +68,7 @@ jobs:
     runs-on: macos-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
       with:
         ref: "${{ github.event.inputs.version }}"
     - name: Publish

.github/workflows/integrationTests.yml

@@ -31,14 +31,14 @@ jobs:
     runs-on: ${{ matrix.env.os }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
     - name: Select ${{ matrix.env.xcode }}
       run: sudo xcode-select --switch /Applications/${{ matrix.env.xcode }}.app
     - name: Unit tests
       run: make XC_LOG=unit IOS_SIMULATOR="${{ matrix.env.iossim }}" TVOS_SIMULATOR="${{ matrix.env.tvossim }}" tests/unit
     - name: Attach Xcode logs
       if: '!cancelled()'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: ${{ matrix.env.xcode }}-unit-logs
         path: "*-unit.log"
@@ -71,14 +71,14 @@ jobs:
       DD_API_KEY: '${{ secrets.DD_API_KEY }}'
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
     - name: Select ${{ matrix.env.xcode }}
       run: sudo xcode-select --switch /Applications/${{ matrix.env.xcode }}.app
     - name: Run tests for ${{ matrix.platform }}
       run: make XC_LOG=integration IOS_SIMULATOR="${{ matrix.env.iossim }}" TVOS_SIMULATOR="${{ matrix.env.tvossim }}" tests/integration/${{ matrix.platform }}
     - name: Attach Xcode logs
       if: '!cancelled()'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: ${{ matrix.env.xcode }}-${{ matrix.platform }}-integration-log
         path: "*-integration.log"