Skip to content

Commit

Permalink
Merge branch 'master' into feature/202308_vite
Browse files Browse the repository at this point in the history
  • Loading branch information
qdraw committed Sep 26, 2023
2 parents faa5b1c + 7066f3e commit bdd2a23
Show file tree
Hide file tree
Showing 51 changed files with 972 additions and 1,180 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-dotnet-sdk-version-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: master

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-update-application-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-update-nuget-packages-list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto-update-swagger-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
timeout-minutes: 15

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Cache nuget packages (*nix)
uses: actions/cache@v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: master

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: master

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clientapp-react-linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
node-version: [20.5.1, 18.x, 16.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clientapp-react-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
node-version: [18.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache node modules clientapp
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation-linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
node-version: [18.x, 16.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build ${{ matrix.node-version }}
uses: actions/setup-node@v3
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/end2end-ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
WEBSITE_SITE_NAME: "ci"
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Create temp folder
shell: bash
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
systemctl --user -l status starsky
- name: Run Cypress in Electron
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
CYPRESS_BASE_URL: http://localhost:4000
cypress_name: local
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/end2end-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
WEBSITE_SITE_NAME: "ci"
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Create temp folder
shell: powershell
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
run: .\pm2-warmup.ps1 -port 4000

- name: Run Cypress in Electron
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
CYPRESS_BASE_URL: http://localhost:4000
cypress_name: local
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-on-tag-docker-hub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,28 @@ jobs:
steps:

- name: Check Out Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set output for tags
id: pushtags
run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT && cat $GITHUB_OUTPUT

- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

- name: Log in to Github Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Inspect Docker Buildx
run: |
Expand All @@ -46,7 +46,7 @@ jobs:
- name: Build and push ${{ steps.pushtags.outputs.tag }}
id: docker_build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./starsky
platforms: linux/amd64,linux/arm64,linux/arm/v7
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-on-tag-netcore-desktop-electron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Build --no-unit-test linux-arm,linux-arm64,win-x64,osx-x64,linux-x64
shell: bash
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
needs: [build_core]
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download osx-x64 as build artifact
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
needs: [build_core]
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download starsky-win-x64 as build artifact
uses: actions/download-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/starsky-codecov-clientapp-netcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ jobs:

steps:
- name: 'Checkout repository on branch: ${{ github.REF }}'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.HEAD_REF }}

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Cache node modules clientapp (*nix)
uses: actions/cache@v3
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/starsky-docker-buildx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ jobs:
steps:

- name: Check Out Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Log in to Github Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Inspect Docker Buildx
run: |
Expand All @@ -51,14 +51,14 @@ jobs:
- name: Extract metadata Github Actions (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/${{ github.repository }}
- name: Build and push master
id: docker_build_push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
if: github.event_name != 'pull_request'
with:
context: ./starsky
Expand All @@ -69,7 +69,7 @@ jobs:

- name: Build and don't push
id: docker_build_pull_request
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
if: github.event_name == 'pull_request'
with:
context: ./starsky
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/starsky-dotnetcore-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ jobs:

steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Cache nuget packages (*nix)
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/starsky-dotnetcore-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:

steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Build (Windows)
shell: pwsh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/starsky-sonarqube-clientapp-netcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: 'Checkout repository on branch: ${{ github.REF }}'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.HEAD_REF }}

Expand All @@ -43,7 +43,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Use Java 17
uses: actions/setup-java@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-tools-node-smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
node-version: [16.x, 18.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starskyapp-electron-pr-build-mac-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
os: [macos-latest, windows-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Fake Starsky Zip (Windows)
shell: bash
working-directory: ./starsky
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/storybook-clientapp-netlify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache node modules clientapp
uses: actions/cache@v3
Expand All @@ -45,7 +45,7 @@ jobs:
path: ./starsky/starsky/clientapp/storybook-static

- name: Deploy to Netlify
uses: nwtgck/actions-netlify@v2.0
uses: nwtgck/actions-netlify@v2.1
if: github.event_name != 'pull_request'
with:
publish-dir: './starsky/starsky/clientapp/storybook-static'
Expand Down
Loading

0 comments on commit bdd2a23

Please sign in to comment.