Skip to content

Commit

Permalink
Merge branch 'main' into pd#2978
Browse files Browse the repository at this point in the history
  • Loading branch information
vzhukovs committed Nov 17, 2023
2 parents b0778dc + e4bf412 commit b96324c
Show file tree
Hide file tree
Showing 120 changed files with 4,526 additions and 704 deletions.
2 changes: 1 addition & 1 deletion .electron-builder.config.cjs
Expand Up @@ -124,7 +124,7 @@ const config = {
],
useWaylandFlags: 'false',
artifactName: 'podman-desktop-${version}.${ext}',
runtimeVersion: '22.08',
runtimeVersion: '23.08',
branch: 'main',
files: [
['.flatpak-appdata.xml', '/share/metainfo/io.podman_desktop.PodmanDesktop.metainfo.xml'],
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.json
Expand Up @@ -24,6 +24,7 @@
"project": [
"packages/*/tsconfig.json",
"./website/tsconfig.json",
"./website-argos/tsconfig.json",
"./extensions/*/tsconfig.json",
"./tests/tsconfig.json",
"./tools/tsconfig.json"
Expand Down
79 changes: 79 additions & 0 deletions .github/workflows/argos.yaml
@@ -0,0 +1,79 @@
#
# Copyright (C) 2023 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0

name: Argos CI Screenshots

on:
workflow_dispatch:
push:
branches:
- main
paths:
- 'package.json'
- 'yarn.lock'
- 'website/**'
- 'website-argos/**'
pull_request:
branches:
- main
paths:
- 'package.json'
- 'yarn.lock'
- 'website/**'
- 'website-argos/**'

jobs:
take-screenshots:
name: take screenshots
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> ${GITHUB_OUTPUT}

- uses: actions/cache@v3
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Execute yarn
run: yarn --frozen-lockfile

- name: Run website
run: yarn website:build

- name: Install Playwright browsers
working-directory: website-argos
run: yarn playwright install --with-deps chromium

- name: Take screenshots with Playwright
run: yarn website:screenshots

- name: Upload screenshots to Argos
continue-on-error: true
working-directory: website-argos
run: yarn upload
env:
ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/downloads-count.yaml
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/github-script@v6
- uses: actions/github-script@v7
id: process-downloads
with:
script: |
Expand Down
94 changes: 94 additions & 0 deletions .github/workflows/e2e-main.yaml
@@ -0,0 +1,94 @@
#
# Copyright (C) 2023 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0

name: e2e-tests-main

on:
push:
branches: [main]

workflow_dispatch:
inputs:
organization:
default: 'containers'
description: 'Organization of the Podman Desktop repository'
type: string
required: true
repositoryName:
default: 'podman-desktop'
description: 'Podman Desktop repository name'
type: string
required: true
branch:
default: 'main'
description: 'Podman Desktop repo branch'
type: string
required: true

jobs:
e2e-tests:
name: Run E2E tests
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
repository: ${{ github.event.inputs.organization }}/${{ github.event.inputs.repositoryName }}
ref: ${{ github.event.inputs.branch }}
if: github.event_name == 'workflow_dispatch'

- uses: actions/checkout@v4
if: github.event_name == 'push'

- uses: actions/setup-node@v4
with:
node-version: 18

- name: Update podman
run: |
sudo sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list"
curl -L "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_22.04/Release.key" | sudo apt-key add -
sudo apt-get update -qq
sudo apt-get -qq -y install podman || { echo "Start fallback steps for podman nightly installation from a static mirror" && \
sudo sh -c "echo 'deb http://ftp.lysator.liu.se/pub/opensuse/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list" && \
curl -L "http://ftp.lysator.liu.se/pub/opensuse/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_22.04/Release.key" | sudo apt-key add - && \
sudo apt-get update && \
sudo apt-get -y install podman; }
podman version
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> ${GITHUB_OUTPUT}

- uses: actions/cache@v3
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Execute yarn
run: yarn --frozen-lockfile

- name: Run All E2E tests
run: yarn test:e2e

- uses: actions/upload-artifact@v3.1.2
if: always()
with:
name: e2e-tests
path: ./tests/output/
2 changes: 1 addition & 1 deletion .github/workflows/next-build.yaml
Expand Up @@ -134,7 +134,7 @@ jobs:
sudo apt-get install flatpak-builder -y
sudo apt-get install elfutils -y
flatpak remote-add --if-not-exists flathub --user https://flathub.org/repo/flathub.flatpakrepo
flatpak install flathub --user -y org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08
flatpak install flathub --user -y org.freedesktop.Platform//23.08 org.freedesktop.Sdk//23.08
- name: Set macOS environment variables
if: startsWith(matrix.os, 'macos')
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/pr-check.yaml
Expand Up @@ -116,7 +116,7 @@ jobs:
sudo apt-get install flatpak-builder -y
sudo apt-get install elfutils -y
flatpak remote-add --if-not-exists flathub --user https://flathub.org/repo/flathub.flatpakrepo
flatpak install flathub --no-static-deltas --user -y org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08
flatpak install flathub --no-static-deltas --user -y org.freedesktop.Platform//23.08 org.freedesktop.Sdk//23.08
- name: Run Build
timeout-minutes: 20
Expand Down Expand Up @@ -267,9 +267,13 @@ jobs:
- name: Update podman
run: |
sudo sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list"
curl -L https://build.opensuse.org/projects/devel:kubic:libcontainers:unstable/signing_keys/download?kind=gpg | sudo apt-key add -
curl -L "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_22.04/Release.key" | sudo apt-key add -
sudo apt-get update -qq
sudo apt-get install -y podman
sudo apt-get -qq -y install podman || { echo "Start fallback steps for podman nightly installation from a static mirror" && \
sudo sh -c "echo 'deb http://ftp.lysator.liu.se/pub/opensuse/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list" && \
curl -L "http://ftp.lysator.liu.se/pub/opensuse/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_22.04/Release.key" | sudo apt-key add - && \
sudo apt-get update && \
sudo apt-get -y install podman; }
podman version
- name: Get yarn cache directory path
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-website-pr-netlify.yaml
Expand Up @@ -54,7 +54,7 @@ jobs:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}

- name: 'Update status of Pull Request'
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const { repo: { owner, repo } } = context;
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Expand Up @@ -191,7 +191,7 @@ jobs:
sudo apt-get install flatpak-builder -y
sudo apt-get install elfutils -y
flatpak remote-add --if-not-exists flathub --user https://flathub.org/repo/flathub.flatpakrepo
flatpak install flathub --no-static-deltas --user -y org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08
flatpak install flathub --no-static-deltas --user -y org.freedesktop.Platform//23.08 org.freedesktop.Sdk//23.08
- name: Set macOS environment variables
if: startsWith(matrix.os, 'macos')
run: |
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -61,10 +61,10 @@ Requirements:

Optional Linux requirements:

- [Flatpak builder, runtime, and SDK, version 22.08](https://docs.flatpak.org/en/latest/first-build.html)
- [Flatpak builder, runtime, and SDK, version 23.08](https://docs.flatpak.org/en/latest/first-build.html)
```sh
flatpak remote-add --if-not-exists flathub --user https://flathub.org/repo/flathub.flatpakrepo
flatpak install --user flathub org.flatpak.Builder org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08
flatpak install --user flathub org.flatpak.Builder org.freedesktop.Platform//23.08 org.freedesktop.Sdk//23.08
```
- GNU C and C++ compiler
Fedora/RHEL
Expand Down
1 change: 1 addition & 0 deletions RELEASE.md
Expand Up @@ -2,6 +2,7 @@

## Pre-requisites

- Create Enhancement Issue `Release vX.X.X` for current sprint, then update the label to `kind/release` and assign it to yourself.
- Confirm with Podman Desktop maintainers that pending / need-to-go-in PR's have been merged.
- Notify main contributors on Discord / Slack.
- Release notes for the blog: Communicate with the person who has been tasked with creating the documentation. If you are assigned, see the below "Documentation" section.
Expand Down
4 changes: 4 additions & 0 deletions extensions/kubectl-cli/.extfiles
@@ -0,0 +1,4 @@
dist/**
node_modules/**
icon.png
package.json
3 changes: 3 additions & 0 deletions extensions/kubectl-cli/README.md
@@ -0,0 +1,3 @@
# kubectl CLI Tool for Podman Desktop

Podman-desktop kubectl CLI Tool extension repository.
Binary file added extensions/kubectl-cli/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions extensions/kubectl-cli/package.json
@@ -0,0 +1,30 @@
{
"name": "kubectl-cli-tool",
"displayName": "kubectl CLI",
"description": "Install and update kubectl CLI Tools without leaving Podman Desktop",
"version": "0.0.1",
"icon": "icon.png",
"publisher": "redhat",
"license": "Apache-2.0",
"engines": {
"podman-desktop": "^0.0.1"
},
"main": "./dist/extension.js",
"scripts": {
"build": "vite build && node ./scripts/build.js",
"test": "vitest run --coverage",
"watch": "vite build -w",
"format:check": "prettier --check \"**/*.ts\" \"scripts/*.js\"",
"format:fix": "prettier --write \"**/*.ts\" \"scripts/*.js\""
},
"dependencies": {
"@podman-desktop/api": "^0.0.1"
},
"devDependencies": {
"byline": "^5.0.0",
"copyfiles": "^2.4.1",
"mkdirp": "^2.1.3",
"vitest": "^0.34.6",
"zip-local": "^0.3.5"
}
}
63 changes: 63 additions & 0 deletions extensions/kubectl-cli/scripts/build.js
@@ -0,0 +1,63 @@
#!/usr/bin/env node
/**********************************************************************
* Copyright (C) 2023 Red Hat, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* SPDX-License-Identifier: Apache-2.0
***********************************************************************/

const zipper = require('zip-local');
const path = require('path');
const package = require('../package.json');
const { mkdirp } = require('mkdirp');
const fs = require('fs');
const byline = require('byline');
const cp = require('copyfiles');

const destFile = path.resolve(__dirname, `../${package.name}.cdix`);
const builtinDirectory = path.resolve(__dirname, '../builtin');
const zipDirectory = path.resolve(builtinDirectory, `${package.name}.cdix`);
const extFiles = path.resolve(__dirname, '../.extfiles');
const fileStream = fs.createReadStream(extFiles, { encoding: 'utf8' });

const includedFiles = [];

// remove the .cdix file before zipping
if (fs.existsSync(destFile)) {
fs.rmSync(destFile);
}
// remove the builtin folder before zipping
if (fs.existsSync(builtinDirectory)) {
fs.rmSync(builtinDirectory, { recursive: true, force: true });
}

byline(fileStream)
.on('data', line => {
includedFiles.push(line);
})
.on('error', () => {
throw new Error('Error reading .extfiles');
})
.on('end', () => {
includedFiles.push(zipDirectory);
mkdirp.sync(zipDirectory);
console.log(`Copying files to ${zipDirectory}`);
cp(includedFiles, error => {
if (error) {
throw new Error('Error copying files', error);
}
console.log(`Zipping files to ${destFile}`);
zipper.sync.zip(zipDirectory).compress().save(destFile);
});
});

0 comments on commit b96324c

Please sign in to comment.