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.

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

Fix tests #619

Merged
merged 1 commit into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: "CodeQL"

on:
push:
branches: [ "master" ]
branches: [ "main" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "master" ]
branches: [ "main" ]
schedule:
# runs on 19:17 every Tuesday
- cron: '27 19 * * 2'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/website-deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

push:
branches:
- master
- main

env:
AWS_REGION: us-east-2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- markdownlint-disable -->
<a href="https://cpco.io/homepage"><img src=".github/banner.png?raw=true" alt="Project Banner"/></a><br/>
<p align="right">
<a href="https://github.com/cloudposse/atmos/releases/latest"><img src="https://img.shields.io/github/release/cloudposse/atmos.svg?style=for-the-badge" alt="Latest Release"/></a><a href="https://github.com/cloudposse/atmos/commits/master/"><img src="https://img.shields.io/github/last-commit/cloudposse/atmos/master?style=for-the-badge" alt="Last Updated"/></a><a href="https://github.com/cloudposse/atmos/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/cloudposse/atmos/test.yml?style=for-the-badge" alt="Tests"/></a><a href="https://slack.cloudposse.com"><img src="https://slack.cloudposse.com/for-the-badge.svg" alt="Slack Community"/></a></p>
<a href="https://github.com/cloudposse/atmos/releases/latest"><img src="https://img.shields.io/github/release/cloudposse/atmos.svg?style=for-the-badge" alt="Latest Release"/></a><a href="https://github.com/cloudposse/atmos/commits/main/"><img src="https://img.shields.io/github/last-commit/cloudposse/atmos/main?style=for-the-badge" alt="Last Updated"/></a><a href="https://github.com/cloudposse/atmos/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/cloudposse/atmos/test.yml?style=for-the-badge" alt="Tests"/></a><a href="https://slack.cloudposse.com"><img src="https://slack.cloudposse.com/for-the-badge.svg" alt="Slack Community"/></a></p>
<!-- markdownlint-restore -->

<!--
Expand Down
4 changes: 2 additions & 2 deletions README.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ badges:
image: https://img.shields.io/github/release/cloudposse/atmos.svg?style=for-the-badge
url: https://github.com/cloudposse/atmos/releases/latest
- name: "Last Updated"
image: https://img.shields.io/github/last-commit/cloudposse/atmos/master?style=for-the-badge
url: https://github.com/cloudposse/atmos/commits/master/
image: https://img.shields.io/github/last-commit/cloudposse/atmos/main?style=for-the-badge
url: https://github.com/cloudposse/atmos/commits/main/
- name: Tests
image: https://img.shields.io/github/actions/workflow/status/cloudposse/atmos/test.yml?style=for-the-badge
url: https://github.com/cloudposse/atmos/actions/workflows/test.yml
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
var (
NotFound = errors.New("\n'atmos.yaml' CLI config was not found in any of the searched paths: system dir, home dir, current dir, ENV vars." +
"\nYou can download a sample config and adapt it to your requirements from " +
"https://raw.githubusercontent.com/cloudposse/atmos/master/examples/quick-start/atmos.yaml")
"https://raw.githubusercontent.com/cloudposse/atmos/main/examples/quick-start/atmos.yaml")

defaultCliConfig = schema.CliConfiguration{
BasePath: ".",
Expand Down
2 changes: 1 addition & 1 deletion pkg/describe/describe_affected_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestDescribeAffectedWithTargetRefClone(t *testing.T) {

// Git reference and commit SHA
// Refer to https://git-scm.com/book/en/v2/Git-Internals-Git-References for more details
ref := "refs/heads/master"
ref := "refs/heads/main"
sha := ""

affected, err := e.ExecuteDescribeAffectedWithTargetRefClone(cliConfig, ref, sha, "", "", true, true)
Expand Down
2 changes: 1 addition & 1 deletion website/blog/authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ atmos:
name: atmos
title: atmos
url: https://github.com/cloudposse/atmos
image_url: https://github.com/cloudposse/atmos/raw/master/docs/img/atmos-logo-128.svg
image_url: https://github.com/cloudposse/atmos/raw/main/docs/img/atmos-logo-128.svg
4 changes: 2 additions & 2 deletions website/docs/cli/commands/describe/describe-affected.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ Counting objects: 100% (1157/1157), done.
Compressing objects: 100% (576/576), done.
Total 4215 (delta 658), reused 911 (delta 511), pack-reused 3058

Checked out Git ref 'refs/heads/master'
Checked out Git ref 'refs/heads/main'

Current working repo HEAD: 7d37c1e890514479fae404d13841a2754be70cbf refs/heads/describe-affected
Remote repo HEAD: 40210e8d365d3d88ac13c0778c0867b679bbba69 refs/heads/master
Remote repo HEAD: 40210e8d365d3d88ac13c0778c0867b679bbba69 refs/heads/main

Changed files:

Expand Down
2 changes: 1 addition & 1 deletion website/docs/introduction/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ See [all features of Atmos](/features).

## Atmos is Open Source (APACHE2)

[![Last Commit](https://img.shields.io/github/last-commit/cloudposse/atmos/master?style=social)](https://github.com/cloudposse/atmos/commits/master/)
[![Last Commit](https://img.shields.io/github/last-commit/cloudposse/atmos/main?style=social)](https://github.com/cloudposse/atmos/commits/main/)
[![Atmos Repo](https://img.shields.io/github/stars/cloudposse/atmos)](https://github.com/cloudposse/atmos)

Best of all [Atmos is truly open-source](https://github.com/cloudposse/atmos) (APACHE2) with an [active community](https://slack.cloudposse.com)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ description: "Learn how to migrate an Atmos component to a new name or to use th
1. Pull down the latest `vpc` component and repeat the previous step (optional)

```sh
⨠ wget https://raw.githubusercontent.com/cloudposse/atmos/master/examples/quick-start/components/terraform/vpc/component.yaml -O components/terraform/vpc/component.yaml
⨠ wget https://raw.githubusercontent.com/cloudposse/atmos/main/examples/quick-start/components/terraform/vpc/component.yaml -O components/terraform/vpc/component.yaml
⨠ sed -i 's,infra/vpc-flow-logs-bucket,vpc,g' components/terraform/vpc/component.yaml
⨠ atmos vendor pull -c vpc
```
Expand Down
Loading