Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
maxisoft committed Oct 29, 2023
2 parents 000979a + ede1e01 commit fde7332
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/bump-asf-reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
token: ${{ env.PUSH_GITHUB_TOKEN }}

Expand All @@ -33,7 +33,7 @@ jobs:
excludes: draft,prerelease

- name: Import GPG key for signing
uses: crazy-max/ghaction-import-gpg@v5.3.0
uses: crazy-max/ghaction-import-gpg@v6.0.0
if: ${{ env.GPG_PRIVATE_KEY != null }}
with:
gpg_private_key: ${{ env.GPG_PRIVATE_KEY }}
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
fi
- name: Push changes to the repo
uses: ad-m/github-push-action@v0.6.0
uses: ad-m/github-push-action@v0.8.0
with:
github_token: ${{ env.PUSH_GITHUB_TOKEN }}
branch: ${{ github.ref }}
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/keepalive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Keep the repo alive
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.3
- uses: actions/checkout@v4.1.1
timeout-minutes: 5
- uses: gautamkrishnar/keepalive-workflow@v1
timeout-minutes: 5
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
submodules: recursive

Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
- name: Upload generic
continue-on-error: true
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
name: ${{ matrix.os }}_${{ env.PLUGIN_NAME }}-generic
path: out/${{ env.PLUGIN_NAME }}-generic.zip
Expand All @@ -172,7 +172,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1

# TODO: It'd be perfect if we could match final artifacts to the platform they target, so e.g. linux build comes from the linux machine
# However, that is currently impossible due to https://github.com/dotnet/msbuild/issues/3897
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
timeout-minutes: 5
with:
submodules: recursive
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Upload stdout
continue-on-error: true
if: always()
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
name: ${{ matrix.configuration }}_${{ matrix.asf_docker_tag }}_stdout
path: out.txt
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "ArchiSteamFarm"]
path = ArchiSteamFarm
url = https://github.com/JustArchiNET/ArchiSteamFarm.git
branch = 5.4.8.3
branch = 5.4.12.5
[submodule "BloomFilter"]
path = BloomFilter
url = https://gist.github.com/8c74d66798a21e05a35b0023573f48e9.git

0 comments on commit fde7332

Please sign in to comment.