Skip to content

Commit

Permalink
Merge pull request #13304 from richard-cox/fix-action-upload-artifact
Browse files Browse the repository at this point in the history
[2.9] Bump version of gh artifact actions
  • Loading branch information
rak-phillip authored Feb 6, 2025
2 parents e1a6686 + 65f292a commit dd03962
Show file tree
Hide file tree
Showing 12 changed files with 54 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/add-issue-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
permissions:
issues: write
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
name: Build & Upload Hosted
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
name: Build & Upload Embedded
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-extension-charts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
- name: Upload charts artifact
if: github.ref_type == 'tag' || (github.ref == 'refs/heads/main' && github.event_name != 'pull_request') || inputs.is_test == 'true'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: charts
path: tmp
Expand All @@ -135,7 +135,7 @@ jobs:
git config user.email 'github-actions[bot]@users.noreply.github.com'
- name: Download build artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: charts

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
unit-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand All @@ -19,7 +19,7 @@ jobs:
i18n:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand All @@ -29,7 +29,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
shell: bash

- name: Upload files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docusaurus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 16.x
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-gh-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
id-token: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rancher-components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
validate-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: actions/setup-node@v3
Expand All @@ -26,7 +26,7 @@ jobs:
validate-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-rancher-components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
contents: read
packages: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-rancher-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false
Expand All @@ -30,7 +30,7 @@ jobs:
ROUTER_BASE="/dashboard" RANCHER_ENV=desktop ./.github/workflows/scripts/build-dashboard.sh

- name: Upload Build
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
path: ${{ env.RELEASE_DIR}}/${{ env.ARTIFACT_NAME }}*
name: ${{ env.ARTIFACT_NAME }}
Expand All @@ -40,12 +40,12 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1
persist-credentials: false
- name: Download build
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: ${{ env.ARTIFACT_NAME }}
path: build
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Setup env
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Setup env
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
TEST_USERNAME: ${{ matrix.role.username }}

- name: Upload screenshots
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() }}
with:
name: ${{github.run_number}}-${{github.run_attempt}}-screenshots-${{ matrix.role.tag }}+${{ matrix.features[0] }}
Expand All @@ -140,7 +140,7 @@ jobs:
unit-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand All @@ -154,15 +154,15 @@ jobs:
cp -r coverage/unit/ coverage-artifacts/coverage/unit/
- name: Upload coverage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{github.run_number}}-${{github.run_attempt}}-coverage
path: coverage-artifacts/**/*

i18n:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand All @@ -172,7 +172,7 @@ jobs:
check-i18n:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: actions/setup-node@v3
Expand All @@ -190,7 +190,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand All @@ -200,7 +200,7 @@ jobs:
check-e2e-tags:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: actions/setup-node@v3
Expand Down
53 changes: 27 additions & 26 deletions cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,40 +144,41 @@ describe('Git Repo', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] }, (
;
});

it('check table headers are available in list and details view', { tags: ['@vai', '@adminUser'] }, function() {
const workspace = 'fleet-default';
// Enabling again in https://github.com/rancher/dashboard/pull/13305
// it('check table headers are available in list and details view', { tags: ['@vai', '@adminUser'] }, function() {
// const workspace = 'fleet-default';

// go to fleet gitrepo
listPage.goTo();
listPage.waitForPage();
headerPo.selectWorkspace(workspace);
// // go to fleet gitrepo
// listPage.goTo();
// listPage.waitForPage();
// headerPo.selectWorkspace(workspace);

// check table headers
const expectedHeadersListView = ['State', 'Name', 'Repo', 'Target', 'Clusters Ready', 'Resources', 'Age'];
// // check table headers
// const expectedHeadersListView = ['State', 'Name', 'Repo', 'Target', 'Clusters Ready', 'Resources', 'Age'];

listPage.repoList().resourceTable().sortableTable().tableHeaderRow()
.within('.table-header-container .content')
.each((el, i) => {
expect(el.text().trim()).to.eq(expectedHeadersListView[i]);
});
// listPage.repoList().resourceTable().sortableTable().tableHeaderRow()
// .within('.table-header-container .content')
// .each((el, i) => {
// expect(el.text().trim()).to.eq(expectedHeadersListView[i]);
// });

// go to fleet gitrepo details
listPage.repoList().details(this.gitRepo, 2).find('a').click();
// // go to fleet gitrepo details
// listPage.repoList().details(this.gitRepo, 2).find('a').click();

const gitRepoDetails = new FleetGitRepoDetailsPo(workspace, this.gitRepo);
// const gitRepoDetails = new FleetGitRepoDetailsPo(workspace, this.gitRepo);

gitRepoDetails.waitForPage(null, 'bundles');
// gitRepoDetails.waitForPage(null, 'bundles');

// check table headers
const expectedHeadersDetailsView = ['State', 'Name', 'Deployments', 'Last Updated', 'Date'];
// // check table headers
// const expectedHeadersDetailsView = ['State', 'Name', 'Deployments', 'Last Updated', 'Date'];

gitRepoDetails.bundlesTab().list().resourceTable().sortableTable()
.tableHeaderRow()
.within('.table-header-container .content')
.each((el, i) => {
expect(el.text().trim()).to.eq(expectedHeadersDetailsView[i]);
});
});
// gitRepoDetails.bundlesTab().list().resourceTable().sortableTable()
// .tableHeaderRow()
// .within('.table-header-container .content')
// .each((el, i) => {
// expect(el.text().trim()).to.eq(expectedHeadersDetailsView[i]);
// });
// });

it('check all tabs are available in the details view', function() {
// testing https://github.com/rancher/dashboard/issues/11155
Expand Down

0 comments on commit dd03962

Please sign in to comment.