Skip to content

Commit

Permalink
Merge branch 'release/2.6' of github.com:OpenVPN/openvpn-build into m…
Browse files Browse the repository at this point in the history
…erge-2.6

* 'release/2.6' of github.com:OpenVPN/openvpn-build:
  chore(deps): update src/openvpn digest to 4abdb12
  chore(deps): update actions/checkout action to v4.1.0
  chore(deps): update src/vcpkg digest to 5a38b5e
  chore(deps): update aws-actions/configure-aws-credentials action to v4
  chore(deps): update actions/upload-artifact action to v3.1.3
  chore(deps): update src/vcpkg digest to 4cfabe7
  debian-sbuild: drop EOL Ubuntu kinetic (22.10)
  chore(deps): update aws-actions/configure-aws-credentials action to v3.0.2
  chore(deps): update src/openvpn-gui digest to a02ccb5
  chore(deps): update actions/cache action to v3.3.2
  chore(deps): update src/openvpn digest to 70ef43f
  • Loading branch information
flichtenheld committed Sep 25, 2023
2 parents f16447d + 1cde719 commit de92e20
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout openvpn-build
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
with:
fetch-depth: 0
submodules: true
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
echo "DATETIME=${dt}" >> $Env:GITHUB_ENV
- name: Archive artifacts
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
with:
name: openvpn-master-${{ env.DATETIME }}-${{ env.OPENVPN_COMMIT }}-${{ matrix.arch }}
path: ${{ github.workspace }}\windows-msi\image\*-${{ matrix.arch }}.msi
Expand All @@ -93,14 +93,14 @@ jobs:

steps:
- name: configure aws credentials
uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # v3.0.1
uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 # v4.0.0
with:
role-to-assume: arn:aws:iam::217307881341:role/GitHubActions
role-session-name: githubactions
aws-region: ${{ env.AWS_REGION }}

- name: Clone openvpn-windows-test repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
with:
repository: openvpn/openvpn-windows-test
ref: master
Expand All @@ -126,7 +126,7 @@ jobs:
.\Start-AWSTest.ps1 -SSH_KEY ~/.ssh/id_rsa -MSI_PATH $(Get-ChildItem ../msi/*-amd64/*.msi | select -ExpandProperty FullName)
- name: Archive openvpn logs
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
if: ${{ always() }}
with:
name: t_client_openvpn_logs
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:

steps:
- name: Checkout openvpn-build
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
with:
fetch-depth: 0
submodules: true
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
- name: Restore cached chroots
id: chroots-restore
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: |
debian-sbuild/chroots
Expand All @@ -230,7 +230,7 @@ jobs:
- name: Save chroots
if: steps.chroots-restore.outputs.cache-hit != 'true'
id: chroots-save
uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: |
debian-sbuild/chroots
Expand All @@ -247,7 +247,7 @@ jobs:
sg sbuild ./scripts/build-all.sh
- name: Archive packages
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
with:
name: openvpn-debian
path: |
Expand Down
1 change: 0 additions & 1 deletion debian-sbuild/config/variants.amd64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ debian bullseye amd64
debian bookworm amd64
ubuntu focal amd64
ubuntu jammy amd64
ubuntu kinetic amd64
ubuntu lunar amd64
2 changes: 1 addition & 1 deletion src/openvpn-gui
Submodule openvpn-gui updated 2 files
+0 −3 config-msvc.h.in
+2 −2 openvpn.c
2 changes: 1 addition & 1 deletion src/vcpkg
Submodule vcpkg updated 1209 files

0 comments on commit de92e20

Please sign in to comment.