Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce warnings in GitHub workflows #9520

Merged
merged 1 commit into from
May 9, 2024
Merged

Reduce warnings in GitHub workflows #9520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/auth_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
with:
submodules: "recursive"

- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
environment-file: env.yml
Expand Down Expand Up @@ -105,9 +105,9 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1
uses: microsoft/setup-msbuild@v2

- name: Install depedencies
- name: Install dependencies
shell: bash
run: |
pip3 install -r requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cloudflare_pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
# Run a build step here if your project requires
- name: Building
shell: bash
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/gh_pages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
cd tools/wasm_chrome
deno run --allow-all generate_branch_file.ts -T ${{ secrets.GITHUB_TOKEN }}
- name: Uploading
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Wasm-Chrome
path: tools/wasm_chrome
Expand All @@ -55,7 +55,7 @@ jobs:
- name: Clone repository
uses: actions/checkout@v4
- name: Uploading
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Logviewer
path: tools/logviewer
Expand All @@ -66,7 +66,7 @@ jobs:
- name: Clone repository
uses: actions/checkout@v4
- name: Uploading
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: AddonStats
path: tools/addonstats
Expand All @@ -78,11 +78,11 @@ jobs:
uses: actions/checkout@v4

- name: Cache conda Packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/conda_pkgs_dir
key: ${{ runner.os }}-conda-packages
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: vpn
environment-file: env.yml
Expand All @@ -94,7 +94,7 @@ jobs:
npm run inspector:build

- name: Uploading
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Inspector Build
path: tools/inspector/dist/app
Expand All @@ -106,7 +106,7 @@ jobs:
- name: Clone repository
uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: "16"

Expand All @@ -118,7 +118,7 @@ jobs:
npm run build

- name: Uploading
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Translations Report
path: tools/translationsreport/app/build
Expand All @@ -134,7 +134,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y $(./scripts/linux/getdeps.py -a linux/debian/control)
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.9"
cache: "pip"
Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:
rm addon_private_key.pem

- name: Uploading
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Addons
path: |
Expand All @@ -185,43 +185,43 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Download Wasm-chrome
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Wasm-Chrome
# Destination path
path: _site
- name: Download a Addons Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Addons
path: _site/addons

- name: Download the Logviewer Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Logviewer
path: _site/logviewer

- name: Download the AddonStats Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: AddonStats
path: _site/addonstats

- name: Download a Inspector Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Inspector Build
path: _site/inspector

- name: Download the Translations Report artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Translations Report
path: _site/translationsreport

- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3

deploy:
name: Deploy Github Page
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
sudo apt-get update
sudo apt-get install -y aspell aspell-en $(./scripts/linux/getdeps.py -b linux/debian/control)

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.9"
cache: "pip"
Expand Down Expand Up @@ -78,15 +78,15 @@ jobs:
with:
fetch-depth: 1
- name: Cache conda Packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/conda_pkgs_dir
key: ${{ runner.os }}-conda-packages
# Glean is required for the gradle build.
- name: Fetch glean submodules
run: |
git submodule update --init 3rdparty/glean
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: vpn
environment-file: env.yml
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.9"
cache: "pip"
Expand All @@ -40,7 +40,7 @@ jobs:
run: ./scripts/linux/script.sh --source --gitref ${GITREF}

- name: Upload source bundle
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Sources
path: .tmp
Expand All @@ -52,7 +52,7 @@ jobs:

steps:
- name: Download Source Package
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Sources

Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
flatpak build-bundle fp-export-dir mozillavpn.flatpak org.mozilla.vpn

- name: Uploading
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Flatpak Build
path: mozillavpn.flatpak
Expand All @@ -95,7 +95,7 @@ jobs:

steps:
- name: Download Source Package
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Sources

Expand All @@ -109,7 +109,7 @@ jobs:
run: rpmbuild -D "_topdir $(pwd)" -D "_sourcedir $(pwd)" -ba mozillavpn.spec

- name: Uploading
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: RPM Build
path: |
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/linux_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ jobs:
sudo apt-get update
sudo apt-get install -y $(./scripts/linux/getdeps.py -a linux/debian/control)

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.9"
cache: "pip"
- run: pip install -r requirements.txt

- name: Cache grcov
id: cache-grcov
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: grcov-build/
key: ${{ runner.os }}-grcov-v0.8.13
Expand All @@ -64,7 +64,7 @@ jobs:
cp ./build/cmake/tests/dummyvpn/dummyvpn build/
cp -r ./build/cmake/tests/dummyvpn/addons build/addons

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: test-client-${{ github.sha }}
path: |
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
- name: Clone repository
uses: actions/checkout@v4

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: test-client-${{ github.sha }}
path: build/
Expand All @@ -112,7 +112,7 @@ jobs:
sudo apt-get install -y $(./scripts/linux/getdeps.py -r linux/debian/control)
sudo apt install --no-upgrade firefox xvfb -y

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.9"
cache: "pip"
Expand All @@ -126,7 +126,7 @@ jobs:

- name: Cache grcov
id: cache-grcov
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: grcov-build/
key: ${{ runner.os }}-grcov-v0.8.13
Expand All @@ -142,7 +142,7 @@ jobs:

- name: Running ${{ matrix.test.name }} Tests
id: runTests
uses: nick-invision/retry@v2
uses: nick-invision/retry@v3
with:
timeout_minutes: 15
max_attempts: 3
Expand All @@ -167,17 +167,19 @@ jobs:
-o ${{ runner.temp }}/artifacts/functional_lcov.info

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
Copy link
Collaborator Author

@flodolo flodolo May 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently Codecov requires a token: codecov/codecov-action#1274 (comment)

Copy link
Collaborator Author

@flodolo flodolo May 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Someone needs to set up a secret (I have access to the key in Codecov, but not this repo).
https://docs.codecov.com/docs/adding-the-codecov-token#github-actions

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly, we should just strip out the codecov checks, they haven't worked since Raphael left the team.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me know if I should remove these steps, or merge this as is ;-)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge it as-is. I can follow up with another PR to strip out the codecov stuff.

if: steps.generateGrcov.outcome == 'success'
with:
directory: .
flags: functional_tests
name: codecov-poc
files: ${{ runner.temp }}/artifacts/functional_lcov.info
verbose: true
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

- name: Uploading artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: ${{ matrix.test.name }} Logs
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/macos_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
submodules: "recursive"

- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
environment-file: env.yml
Expand All @@ -55,7 +55,7 @@ jobs:
cp ./build/cmake/tests/dummyvpn/dummyvpn build/
cp -r ./build/cmake/tests/dummyvpn/addons build/addons

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: test-client-${{ github.sha }}
path: |
Expand Down Expand Up @@ -90,12 +90,14 @@ jobs:
- name: Clone repository
uses: actions/checkout@v4

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: test-client-${{ github.sha }}
path: build/

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
env:
PIP_DISABLE_PIP_VERSION_CHECK: 1
with:
python-version: "3.9"
cache: "pip"
Expand All @@ -115,7 +117,7 @@ jobs:

- name: Running ${{ matrix.test.name }} Tests
id: runTests
uses: nick-invision/retry@v2
uses: nick-invision/retry@v3
with:
timeout_minutes: 15
max_attempts: 3
Expand All @@ -130,8 +132,9 @@ jobs:
MVPN_BIN: ./build/dummyvpn

- name: Uploading artifacts
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't help noticing that this looks very similar to the Linux workflow, which doesn't fail.

That workflow has an additional step though, using the same artifacts folder, so that might be the reason?

      - name: Upload coverage to Codecov
        uses: codecov/codecov-action@v4
        if: steps.generateGrcov.outcome == 'success'
        with:
          directory: .
          flags: functional_tests
          name: codecov-poc
          files: ${{ runner.temp }}/artifacts/functional_lcov.info
          verbose: true

uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: ${{ matrix.test.name }} Logs
path: ${{ runner.temp }}/artifacts
if-no-files-found: ignore
Loading
Loading